diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:18:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:18:08 +0100 |
| commit | 5beddbc4cf81fc29866981cdf62de76299627ed0 (patch) | |
| tree | a04caf5439ebe5172b8047d47faaa241c766fe25 /libavcodec/mpegvideo_enc.c | |
| parent | e052f06531c400a845092a7e425ef97834260b3b (diff) | |
| parent | 2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 (diff) | |
Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b7839715be..92084fa718 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -333,12 +333,6 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) s->flags2 = avctx->flags2; s->max_b_frames = avctx->max_b_frames; s->codec_id = avctx->codec->id; -#if FF_API_MPV_GLOBAL_OPTS - if (avctx->luma_elim_threshold) - s->luma_elim_threshold = avctx->luma_elim_threshold; - if (avctx->chroma_elim_threshold) - s->chroma_elim_threshold = avctx->chroma_elim_threshold; -#endif s->strict_std_compliance = avctx->strict_std_compliance; s->quarter_sample = (avctx->flags & CODEC_FLAG_QPEL) != 0; s->mpeg_quant = avctx->mpeg_quant; @@ -358,11 +352,6 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) /* Fixed QSCALE */ s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); -#if FF_API_MPV_GLOBAL_OPTS - if (s->flags & CODEC_FLAG_QP_RD) - s->mpv_flags |= FF_MPV_FLAG_QP_RD; -#endif - s->adaptive_quant = (s->avctx->lumi_masking || s->avctx->dark_masking || s->avctx->temporal_cplx_masking || @@ -555,11 +544,6 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) return -1; } -#if FF_API_MPV_GLOBAL_OPTS - if (s->flags & CODEC_FLAG_CBP_RD) - s->mpv_flags |= FF_MPV_FLAG_CBP_RD; -#endif - if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) { av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n"); return -1; @@ -680,15 +664,6 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) } s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1; -#if FF_API_MPV_GLOBAL_OPTS - if (avctx->flags2 & CODEC_FLAG2_SKIP_RD) - s->mpv_flags |= FF_MPV_FLAG_SKIP_RD; - if (avctx->flags2 & CODEC_FLAG2_STRICT_GOP) - s->mpv_flags |= FF_MPV_FLAG_STRICT_GOP; - if (avctx->quantizer_noise_shaping) - s->quantizer_noise_shaping = avctx->quantizer_noise_shaping; -#endif - switch (avctx->codec->id) { case AV_CODEC_ID_MPEG1VIDEO: s->out_format = FMT_MPEG1; |