diff options
| author | Martin Storsjö <martin@martin.st> | 2010-09-24 18:04:21 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-09-24 18:04:21 +0000 |
| commit | 6df40295491a9bcbbbb2d46fb9699cbf712b6c01 (patch) | |
| tree | c6a65b670854c8cff426c254ee41b72cc4c20be9 /libavformat/options.c | |
| parent | d860aaf8cd1ff566f4587643bf3cd7cf713f4c32 (diff) | |
| download | ffmpeg-6df40295491a9bcbbbb2d46fb9699cbf712b6c01.tar.gz | |
Add an AVOption max_delay for AVFormatContext->max_delay
This can currently also be set via -muxdelay in ffmpeg for muxers,
but not for demuxers (nor for demuxers in ffplay) - this patch
allows it to be set in all those cases.
Originally committed as revision 25180 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/options.c')
| -rw-r--r-- | libavformat/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/options.c b/libavformat/options.c index 28a49cb1da..3be0a3d17d 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -60,6 +60,7 @@ static const AVOption options[]={ {"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), FF_OPT_TYPE_INT, 3041280, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */ {"fdebug", "print specific debug info", OFFSET(debug), FF_OPT_TYPE_FLAGS, DEFAULT, 0, INT_MAX, E|D, "fdebug"}, {"ts", NULL, 0, FF_OPT_TYPE_CONST, FF_FDEBUG_TS, INT_MIN, INT_MAX, E|D, "fdebug"}, +{"max_delay", "maximum muxing or demuxing delay in microseconds", OFFSET(max_delay), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E|D}, {NULL}, }; |