History

avcodec/mpeg12enc: Disallow using MPEG-2 intra VLC table for mpeg1video

Using MPEG-2 intra VLC tables is spec-incompliant for MPEG-1 and given that an MPEG-1 bitstream can't signal whether MPEG-2 intra VLC tables have been used the output is broken. Therefore this option is removed immediately without any deprecation period.

Andreas Rheinhardt committed 5 years ago

Commit 4e265201 parent 0c8a0d31 file · +2 −2Browse files

Unified · Split

libavcodec/mpeg12enc.c+2−2
@@ -1136,8 +1136,6 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) · 1135 unmodified lines
11361136 #define COMMON_OPTS \
11371137 { "gop_timecode", "MPEG GOP Timecode in hh:mm:ss[:;.]ff format. Overrides timecode_frame_start.", \
11381138 OFFSET(tc_opt_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE },\
1139− { "intra_vlc", "Use MPEG-2 intra VLC table.", \
1140− OFFSET(intra_vlc_format), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \
11411139 { "drop_frame_timecode", "Timecode is in drop frame format.", \
11421140 OFFSET(drop_frame_timecode), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \
11431141 { "scan_offset", "Reserve space for SVCD scan offset user data.", \
@@ -1153,6 +1151,8 @@ static const AVOption mpeg1_options[] = { · 9 unmodified lines
11531151
11541152 static const AVOption mpeg2_options[] = {
11551153 COMMON_OPTS
1154+ { "intra_vlc", "Use MPEG-2 intra VLC table.",
1155+ OFFSET(intra_vlc_format), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
11561156 { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
11571157 { "alternate_scan", "Enable alternate scantable.", OFFSET(alternate_scan), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
11581158 { "seq_disp_ext", "Write sequence_display_extension blocks.", OFFSET(seq_disp_ext), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "seq_disp_ext" },

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t