summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-06-10 14:28:34 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-06-10 14:28:34 +0200
commit5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e (patch)
tree3f384b4cb2992a5dae974e9357715bdc28429648 /libavformat/avformat.h
parent2351ea8a2e8c1ce74c87c8d48494dc2dd4b53ded (diff)
downloadffmpeg-5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e.tar.gz
Allow values >31bit for -analyzeduration.
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index e56a0bca41..16c225479d 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1288,11 +1288,9 @@ typedef struct AVFormatContext {
unsigned int probesize;
/**
- * Maximum duration (in AV_TIME_BASE units) of the data read
- * from input in avformat_find_stream_info().
- * Demuxing only, set by the caller before avformat_find_stream_info().
- * Can be set to 0 to let avformat choose using a heuristic.
+ * @deprecated deprecated in favor of max_analyze_duration2
*/
+ attribute_deprecated
int max_analyze_duration;
const uint8_t *key;
@@ -1649,6 +1647,15 @@ typedef struct AVFormatContext {
* Muxing: set by user via AVOptions (NO direct access)
*/
int64_t output_ts_offset;
+
+ /**
+ * Maximum duration (in AV_TIME_BASE units) of the data read
+ * from input in avformat_find_stream_info().
+ * Demuxing only, set by the caller before avformat_find_stream_info()
+ * via AVOptions (NO direct access).
+ * Can be set to 0 to let avformat choose using a heuristic.
+ */
+ int64_t max_analyze_duration2;
} AVFormatContext;
int av_format_get_probe_score(const AVFormatContext *s);