2 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h
index 7f3779d6d1..1dae84ec8e 100644
--- a/libmpdemux/muxer.h
+++ b/libmpdemux/muxer.h
@@ -48,6 +48,7 @@ typedef struct {
 
   int vbv_size;
   int max_rate;
+  int avg_rate;
 } muxer_stream_t;
 
 typedef struct {
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index c8601738e3..09794c7573 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -185,7 +185,8 @@ static void fix_parameters(muxer_stream_t *stream)
 	
 	ctx = spriv->avstream->codec;
 
-        if(stream->wf && stream->wf->nAvgBytesPerSec)
+        ctx->bit_rate= stream->avg_rate;
+        if(stream->wf && stream->wf->nAvgBytesPerSec && !ctx->bit_rate)
             ctx->bit_rate = stream->wf->nAvgBytesPerSec * 8;
         ctx->rc_buffer_size= stream->vbv_size;
         ctx->rc_max_rate= stream->max_rate;