diff options
author | Martin Storsjö <martin@martin.st> | 2012-03-19 20:37:10 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-03-20 10:53:47 +0200 |
commit | 4fa57d524f16524e9735f99b387167149dbf5a7b (patch) | |
tree | 4ef1afda4d72d8c44e45c52cc845e06011e4f607 /libavformat/mpegenc.c | |
parent | 0d0b81f941a2d5011bec754ba48e84a479306661 (diff) | |
download | ffmpeg-4fa57d524f16524e9735f99b387167149dbf5a7b.tar.gz |
libavformat: Set the default for the max_delay option to -1
Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.
This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/mpegenc.c')
-rw-r--r-- | libavformat/mpegenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 852b3f13c9..bda8d8324b 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -318,6 +318,8 @@ static int mpeg_mux_init(AVFormatContext *ctx) s->packet_size = ctx->packet_size; } else s->packet_size = 2048; + if (ctx->max_delay < 0) /* Not set by the caller */ + ctx->max_delay = 0; s->vcd_padding_bytes_written = 0; s->vcd_padding_bitrate=0; |