Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'

[ffmpeg] / libavformat / avformat.h

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 5c07541b3685181d238f372f5fe2cce9d4fdbe72..01c3b75c37cc5a81498bdb63377566d9ecefcfd2 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1291,6 +1291,7 @@ typedef struct AVFormatContext {
      * 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.
      */
     int max_analyze_duration;
 
@@ -1422,6 +1423,12 @@ typedef struct AVFormatContext {
      */
     int64_t max_interleave_delta;
 
+    /**
+     * Allow non-standard and experimental extension
+     * @see AVCodecContext.strict_std_compliance
+     */
+    int strict_std_compliance;
+
     /**
      * Transport stream id.
      * This will be moved into demuxer private options. Thus no API/ABI compatibility
@@ -1523,6 +1530,13 @@ typedef struct AVFormatContext {
      */
     int probe_score;
 
+    /**
+     * number of bytes to read maximally to identify format.
+     * - encoding: unused
+     * - decoding: set by user through AVOPtions (NO direct access)
+     */
+    int format_probesize;
+
     /*****************************************************************
      * All fields below this line are not part of the public API. They
      * may not be used outside of libavformat and can be changed and