diff --git a/avconv_opt.c b/avconv_opt.c
index ce32df6b6bd5672120d1645803be48b5fd4b6525..e67abefd77cce15eda03f75a5f83fb044633f734 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -950,8 +950,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 23f2ac481a00d73e21019096b9152d5e1926eae0..19c8a99ff571c66ae0ccc12553bdf02b7b87b7e3 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -824,6 +824,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
         } 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)) {