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/mpegtsenc.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/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 493ae2eb6f..a594ca257f 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -460,6 +460,9 @@ static int mpegts_write_header(AVFormatContext *s) const char *provider_name; int *pids; + if (s->max_delay < 0) /* Not set by the caller */ + s->max_delay = 0; + // round up to a whole number of TS packets ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14; |