aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-08-25 21:21:57 +0000
committerAnton Khirnov <anton@khirnov.net>2014-08-27 06:36:48 +0000
commitbbd632082b18e6c5ce9c2d6be8bc260c05ae9417 (patch)
tree973b5a0419d03d24bccbd0a8656c1c5dc3d08937
parente4fb53c73abece15a7c5df0019df9a0371db2297 (diff)
downloadffmpeg-bbd632082b18e6c5ce9c2d6be8bc260c05ae9417.tar.gz
mpegenc: limit the maximum muxrate
It is written to the file as a 22-bit value. CC: libav-stable@libav.org (cherry picked from commit 75bbaf2493a71ee66eaabe3c21fadd84d07888de) Signed-off-by: Anton Khirnov <anton@khirnov.net> Conflicts: libavformat/mpegenc.c (cherry picked from commit 3ac0638d573fc483ba6be3444858b26711c5d67d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavformat/mpegenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 4f7bde848c..218c2eb929 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 },
};