1. ffmpeg
  2. Commit 9aeffb3c2a0d86a1271836f87915d3a2e069cdd2
Browse code

Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'

* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d':
lavc: set the default rc_initial_buffer_occupancy

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/01/15 23:32:48
Showing 2 changed files
ffmpeg_opt.c
History View file @ 9aeffb3
... ... 
@@ -1145,8 +1145,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
1145 1145 
             if (p) p++;
1146 1146 
         }
1147 1147 
         video_enc->rc_override_count = i;
1148 
-        if (!video_enc->rc_initial_buffer_occupancy)
1149 
-            video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size * 3 / 4;
1150 1148 
         video_enc->intra_dc_precision = intra_dc_precision - 8;
1151 1149
1152 1150 
         if (do_psnr)
libavcodec/utils.c
History View file @ 9aeffb3
... ... 
@@ -1018,6 +1018,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
1018 1018 
             && avctx->bit_rate>0 && avctx->bit_rate<1000) {
1019 1019 
             av_log(avctx, AV_LOG_WARNING, "Bitrate %d is extreemly low, did you mean %dk\n", avctx->bit_rate, avctx->bit_rate);
1020 1020 
         }
1021 
+
1022 
+        if (!avctx->rc_initial_buffer_occupancy)
1023 
+            avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3 / 4;
1021 1024 
     }
1022 1025
1023 1026 
     avctx->pts_correction_num_faulty_pts =