[SCM] libav/experimental: Add an AVOption max_delay for AVFormatContext->max_delay

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6df40295491a9bcbbbb2d46fb9699cbf712b6c01
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Sep 24 18:04:21 2010 +0000

    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

diff --git a/libavformat/options.c b/libavformat/options.c
index 28a49cb..3be0a3d 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},
 };
 

-- 
Libav/FFmpeg packaging