summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-07-30 11:09:25 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-07-30 11:09:25 +0200
commitff9a154157ecca30f585c5eb97f1cd600f500213 (patch)
tree288c681e55ec6bf6aadb69fa1345960a34fedd0a /libavformat/avformat.h
parent355121bcb5d921c1e50b34a6f0b8da6a2c8a734f (diff)
Add int64_t probesize2 instead of int probesize to AVFormatContext.
Allows to set a probesize >2G. Tested-by: Oliver Fromme
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 156524a688..7551f7b548 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1296,9 +1296,7 @@ typedef struct AVFormatContext {
#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
/**
- * Maximum size of the data read from input for determining
- * the input container format.
- * Demuxing only, set by the caller before avformat_open_input().
+ * @deprecated deprecated in favor of probesize2
*/
unsigned int probesize;
@@ -1671,6 +1669,14 @@ typedef struct AVFormatContext {
* Can be set to 0 to let avformat choose using a heuristic.
*/
int64_t max_analyze_duration2;
+
+ /**
+ * Maximum size of the data read from input for determining
+ * the input container format.
+ * Demuxing only, set by the caller before avformat_open_input()
+ * via AVOptions (NO direct access).
+ */
+ int64_t probesize2;
} AVFormatContext;
int av_format_get_probe_score(const AVFormatContext *s);