summaryrefslogtreecommitdiff
path: root/libavformat/options_table.h
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-03-19 20:37:10 +0200
committerMartin Storsjö <martin@martin.st>2012-03-20 10:53:47 +0200
commit4fa57d524f16524e9735f99b387167149dbf5a7b (patch)
tree4ef1afda4d72d8c44e45c52cc845e06011e4f607 /libavformat/options_table.h
parent0d0b81f941a2d5011bec754ba48e84a479306661 (diff)
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/options_table.h')
-rw-r--r--libavformat/options_table.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 7aee448c0f..683596c206 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -41,7 +41,7 @@ static const AVOption options[]={
{"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), AV_OPT_TYPE_INT, {.dbl = 3041280 }, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */
{"fdebug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, INT_MAX, E|D, "fdebug"},
{"ts", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_FDEBUG_TS }, INT_MIN, INT_MAX, E|D, "fdebug"},
-{"max_delay", "maximum muxing or demuxing delay in microseconds", OFFSET(max_delay), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E|D},
+{"max_delay", "maximum muxing or demuxing delay in microseconds", OFFSET(max_delay), AV_OPT_TYPE_INT, {.dbl = -1 }, -1, INT_MAX, E|D},
{"fpsprobesize", "number of frames used to probe fps", OFFSET(fps_probe_size), AV_OPT_TYPE_INT, {.dbl = -1}, -1, INT_MAX-1, D},
/* this is a crutch for avconv, since it cannot deal with identically named options in different contexts.
* to be removed when avconv is fixed */