diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:30:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:30:38 +0200 |
| commit | 74128352047ee3fb075b0f69ab16047f70b45a42 (patch) | |
| tree | 944418d43c9d6c56865bd06f14ad6af46748a443 /libavcodec/ratecontrol.c | |
| parent | 17d16008befa82cb79e71fbb4dc28fb4d9ec2ce6 (diff) | |
| parent | a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf (diff) | |
| download | ffmpeg-74128352047ee3fb075b0f69ab16047f70b45a42.tar.gz | |
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
lavc: make rc_qsquish a private option of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 72b3f44ae3..61761446db 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -570,7 +570,7 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, av_dlog(s, "q:%f max:%f min:%f size:%f index:%f agr:%f\n", q, max_rate, min_rate, buffer_size, rcc->buffer_index, s->avctx->rc_buffer_aggressivity); - if (s->avctx->rc_qsquish == 0.0 || qmin == qmax) { + if (s->rc_qsquish == 0.0 || qmin == qmax) { if (q < qmin) q = qmin; else if (q > qmax) |