diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-17 09:02:27 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-05-24 21:37:17 +0200 |
| commit | d587b1c32388fe60d7469424172e15b57bc5b4bd (patch) | |
| tree | 6b9648417087d5ab82b8935ea1fc32864adae8f1 /libavcodec/mpeg12enc.c | |
| parent | de640d2b5327645b250ef913b7e12d56a91828ed (diff) | |
| download | ffmpeg-d587b1c32388fe60d7469424172e15b57bc5b4bd.tar.gz | |
avcodec/mpegvideoenc: Remove ineffective options
This commit removes the ineffective FF_MPV_DEPRECATED_ options,
namely mpeg_quant (this is only an option for MPEG-4), a53cc
(this is only an option for MPEG-2), force_duplicated_matrix
(applies only to MJPEG) and b_strategy, b_sensitivity and brd_scale
(these options only make sense for encoders supporting B-frames,
which currently means the MPEG-1/2 and MPEG-4 encoders).
Given that these options never changed the outcome of encoding,
they are removed at once.
Notice that the options for the encoders for which it made sense
are not affected by this.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mpeg12enc.c')
| -rw-r--r-- | libavcodec/mpeg12enc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e4980240c5..09d63ff7dc 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1142,6 +1142,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) } else { s->min_qcoeff = -2047; s->max_qcoeff = 2047; + s->mpeg_quant = 1; } if (s->intra_vlc_format) { s->intra_ac_vlc_length = @@ -1173,11 +1174,6 @@ static const AVOption mpeg1_options[] = { COMMON_OPTS FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_MPEG_QUANT_OPT - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT -#endif { NULL }, }; @@ -1207,11 +1203,6 @@ static const AVOption mpeg2_options[] = { #undef LEVEL FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - { "mpeg_quant", "Deprecated, does nothing", FF_MPV_OFFSET(mpeg_quant), - AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 1, VE | AV_OPT_FLAG_DEPRECATED }, - FF_MPV_DEPRECATED_MATRIX_OPT -#endif FF_MPEG2_PROFILE_OPTS { NULL }, }; |