diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-01-14 05:32:39 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-15 08:58:51 +0100 |
| commit | 47812070a267cbdf74164e154d03d99bf8ced100 (patch) | |
| tree | 87b1ff9baf76669c0cfb9d26af5b793e9c993024 | |
| parent | bff3607547fdbb6e32b3830a351e6a33280c1e0d (diff) | |
| download | ffmpeg-47812070a267cbdf74164e154d03d99bf8ced100.tar.gz | |
libx264: use the library specific default rc_initial_buffer_occupancy
By default libav sets it to 3/4 while x264 sets it to 9/10.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/libx264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index f536f7f965..e9cbbad22a 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -272,7 +272,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.rc.f_rf_constant_max = x4->crf_max; } - if (avctx->rc_buffer_size && avctx->rc_initial_buffer_occupancy && + if (avctx->rc_buffer_size && avctx->rc_initial_buffer_occupancy > 0 && (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) { x4->params.rc.f_vbv_buffer_init = (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size; @@ -560,6 +560,7 @@ static const AVCodecDefault x264_defaults[] = { { "threads", AV_STRINGIFY(X264_THREADS_AUTO) }, { "thread_type", "0" }, { "flags", "+cgop" }, + { "rc_init_occupancy","-1" }, { NULL }, }; |