diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:32:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:32:48 +0100 |
| commit | 9aeffb3c2a0d86a1271836f87915d3a2e069cdd2 (patch) | |
| tree | 13cb180b56c5378b9f9b9cd4bc6f8396023bb86c | |
| parent | cfc40a6aff8d35627469ef960531264c2f66a74e (diff) | |
| parent | bff3607547fdbb6e32b3830a351e6a33280c1e0d (diff) | |
| download | ffmpeg-9aeffb3c2a0d86a1271836f87915d3a2e069cdd2.tar.gz | |
Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'
* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d':
lavc: set the default rc_initial_buffer_occupancy
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c98e03063b..09f75d3e82 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1145,8 +1145,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in 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; if (do_psnr) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f5ceae4e17..8c0aa9818e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1018,6 +1018,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code && avctx->bit_rate>0 && avctx->bit_rate<1000) { av_log(avctx, AV_LOG_WARNING, "Bitrate %d is extreemly low, did you mean %dk\n", avctx->bit_rate, avctx->bit_rate); } + + if (!avctx->rc_initial_buffer_occupancy) + avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3 / 4; } avctx->pts_correction_num_faulty_pts = |