[FFmpeg-cvslog] mpegenc: limit the maximum muxrate

Anton Khirnov git at videolan.org
Sat Aug 30 20:57:01 CEST 2014


ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Mon Aug 25 21:21:57 2014 +0000| [bbd632082b18e6c5ce9c2d6be8bc260c05ae9417] | committer: Anton Khirnov

mpegenc: limit the maximum muxrate

It is written to the file as a 22-bit value.

CC: libav-stable at libav.org
(cherry picked from commit 75bbaf2493a71ee66eaabe3c21fadd84d07888de)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

Conflicts:
	libavformat/mpegenc.c

(cherry picked from commit 3ac0638d573fc483ba6be3444858b26711c5d67d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbd632082b18e6c5ce9c2d6be8bc260c05ae9417
---

 libavformat/mpegenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 4f7bde8..218c2eb 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1132,7 +1132,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
 #define OFFSET(x) offsetof(MpegMuxContext, x)
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-    { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },
+    { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, (1 << 22) - 1, E },
     { "preload", "Initial demux-decode delay in microseconds.", OFFSET(preload),  AV_OPT_TYPE_INT, {.i64 = 500000}, 0, INT_MAX, E},
     { NULL },
 };



More information about the ffmpeg-cvslog mailing list