# HG changeset patch # User mstorsjo # Date 1285351461 0 # Node ID ac299df1864207aedc6c96faaf5223a1108f1625 # Parent c59fad269e3925b2257e71c9eaedc146c65dbffe 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. diff -r c59fad269e39 -r ac299df18642 options.c --- a/options.c Thu Sep 23 09:53:26 2010 +0000 +++ b/options.c Fri Sep 24 18:04:21 2010 +0000 @@ -60,6 +60,7 @@ {"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}, };