diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:46:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:46:38 +0400 |
| commit | 185164398763b76729d6169bea35d08c48d1d32f (patch) | |
| tree | 27d0d0368c03a9f26718ed2d49bfe5319413288e /libavcodec/ratecontrol.c | |
| parent | cac07d0e103656a2436ea04b700128ce436a4d06 (diff) | |
| parent | b2c31710c96fa47d9dcd40b64d39663e8957f683 (diff) | |
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index a7c96d011b..a621f8f79a 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -689,7 +689,7 @@ static void adaptive_quantization(MpegEncContext *s, double q) } /* handle qmin/qmax clipping */ - if (s->flags & CODEC_FLAG_NORMALIZE_AQP) { + if (s->mpv_flags & FF_MPV_FLAG_NAQ) { float factor = bits_sum / cplx_sum; for (i = 0; i < s->mb_num; i++) { float newq = q * cplx_tab[i] / bits_tab[i]; @@ -714,7 +714,7 @@ static void adaptive_quantization(MpegEncContext *s, double q) float newq = q * cplx_tab[i] / bits_tab[i]; int intq; - if (s->flags & CODEC_FLAG_NORMALIZE_AQP) { + if (s->mpv_flags & FF_MPV_FLAG_NAQ) { newq *= bits_sum / cplx_sum; } |