Partial rewrite stream probe code.

[ffmpeg] / libavformat / options.c

diff --git a/libavformat/options.c b/libavformat/options.c
index 28a49cb1da33097c343cb4638de9cafb1d1d4114..27eb8da76adac55e376ca855d16a91b294497112 100644 (file)
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 
 /**
  * @file
@@ -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},
 };
 
@@ -88,7 +89,7 @@ AVFormatContext *avformat_alloc_context(void)
     return ic;
 }
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_ALLOC_FORMAT_CONTEXT
 AVFormatContext *av_alloc_format_context(void)
 {
     return avformat_alloc_context();