[FFmpeg-cvslog] lavf: clarify/extend documentation for AVFormatContext::analyzeduration

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Jan 12 16:16:36 2013 +0100| [98247e3368fb34eefa8fd4b3ec87e8a564d940bd] | committer: Stefano Sabatini

lavf: clarify/extend documentation for AVFormatContext::analyzeduration

"analyzeduration" is not used to detect the input duration, but to
specify the max probe data duration. Fix option description and related
doc entry accordingly.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98247e3368fb34eefa8fd4b3ec87e8a564d940bd
---

 doc/ffmpeg-formats.texi     |    4 +++-
 libavformat/options_table.h |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/ffmpeg-formats.texi b/doc/ffmpeg-formats.texi
index 03e4f30..30cf415 100644
--- a/doc/ffmpeg-formats.texi
+++ b/doc/ffmpeg-formats.texi
@@ -77,7 +77,9 @@ Reduce the latency introduced by optional buffering
 @end table
 
 @item analyzeduration @var{integer} (@emph{input})
-Specify how many microseconds are analyzed to estimate duration.
+Specify how many microseconds are analyzed to probe the input. A
+higher value will allow to detect more accurate information, but will
+increase latency. It defaults to 5,000,000 microseconds = 5 seconds.
 
 @item cryptokey @var{hexadecimal string} (@emph{input})
 Set decryption key.
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index dbe37d7..e78e598 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -48,7 +48,7 @@ static const AVOption options[]={
 {"keepside", "dont merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"},
 {"latm", "enable RTP MP4A-LATM payload", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"},
 {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"},
-{"analyzeduration", "how many microseconds are analyzed to estimate duration", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT, {.i64 = 5*AV_TIME_BASE }, 0, INT_MAX, D},
+{"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT, {.i64 = 5*AV_TIME_BASE }, 0, INT_MAX, D},
 {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D},
 {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), AV_OPT_TYPE_INT, {.i64 = 1<<20 }, 0, INT_MAX, D},
 {"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), AV_OPT_TYPE_INT, {.i64 = 3041280 }, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */