diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-01-14 05:32:38 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-16 22:54:30 +0200 |
| commit | 2da49df19e115becdddf60f8704889868ca2f56b (patch) | |
| tree | b11599bbb2098d8def5dc7beb4c37c4068c44195 | |
| parent | c25bbb6fdbfb7332af302e0366fc2c2d60b44c72 (diff) | |
| download | ffmpeg-2da49df19e115becdddf60f8704889868ca2f56b.tar.gz | |
lavc: set the default rc_initial_buffer_occupancy
rc_buffer_size is not set before.
Solve the initial the rate control underflow issue reported in
bug 222.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit bff3607547fdbb6e32b3830a351e6a33280c1e0d)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | avconv.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -3664,8 +3664,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) if (p) p++; } video_enc->rc_override_count = i; - if (!video_enc->rc_initial_buffer_occupancy) - video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size * 3 / 4; video_enc->intra_dc_precision = intra_dc_precision - 8; /* two pass mode */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f64bff8ff6..7902e987ca 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -810,6 +810,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } else if (avctx->channel_layout) { avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } + + if (!avctx->rc_initial_buffer_occupancy) + avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3 / 4; } if(avctx->codec->init && !(avctx->active_thread_type&FF_THREAD_FRAME)){ |