generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Browse Source
This commit is contained in:
Anton Khirnov
2014-04-29 08:00:03 +02:00
parent 5fccedaa67
commit b2c31710c9
7 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ratecontrol.c
View File

@@ -672,7 +672,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];
@@ -697,7 +697,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;
}