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.
Unified · Split
| @@ -1136,8 +1136,6 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) · 1135 unmodified lines | |||
| 1136 | #define COMMON_OPTS \ | 1136 | #define COMMON_OPTS \ |
| 1137 | { "gop_timecode", "MPEG GOP Timecode in hh:mm:ss[:;.]ff format. Overrides timecode_frame_start.", \ | 1137 | { "gop_timecode", "MPEG GOP Timecode in hh:mm:ss[:;.]ff format. Overrides timecode_frame_start.", \ |
| 1138 | OFFSET(tc_opt_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE },\ | 1138 | 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 }, \ | ||
| 1141 | { "drop_frame_timecode", "Timecode is in drop frame format.", \ | 1139 | { "drop_frame_timecode", "Timecode is in drop frame format.", \ |
| 1142 | OFFSET(drop_frame_timecode), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ | 1140 | OFFSET(drop_frame_timecode), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ |
| 1143 | { "scan_offset", "Reserve space for SVCD scan offset user data.", \ | 1141 | { "scan_offset", "Reserve space for SVCD scan offset user data.", \ |
| @@ -1153,6 +1151,8 @@ static const AVOption mpeg1_options[] = { · 9 unmodified lines | |||
| 1153 | 1151 | ||
| 1154 | static const AVOption mpeg2_options[] = { | 1152 | static const AVOption mpeg2_options[] = { |
| 1155 | COMMON_OPTS | 1153 | 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 }, | ||
| 1156 | { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, | 1156 | { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, |
| 1157 | { "alternate_scan", "Enable alternate scantable.", OFFSET(alternate_scan), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, | 1157 | { "alternate_scan", "Enable alternate scantable.", OFFSET(alternate_scan), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, |
| 1158 | { "seq_disp_ext", "Write sequence_display_extension blocks.", OFFSET(seq_disp_ext), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "seq_disp_ext" }, | 1158 | { "seq_disp_ext", "Write sequence_display_extension blocks.", OFFSET(seq_disp_ext), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "seq_disp_ext" }, |