X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favformat.h;h=4068ab6a567964787c0907540211fc7d41012a71;hb=ec6b4e21bdfee5e529850e2ed8fe7f265d71abea;hp=e83a374f6daa724a0d8988b9c072bb15f66cb4e5;hpb=f19a2838678ecaf3e14f648c0889463e20a577a8;p=ffmpeg diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e83a374f6da..4068ab6a567 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1396,6 +1396,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats +#if FF_API_PROBESIZE_32 /** * @deprecated deprecated in favor of probesize2 */ @@ -1406,6 +1407,7 @@ typedef struct AVFormatContext { */ attribute_deprecated int max_analyze_duration; +#endif const uint8_t *key; int keylen; @@ -1758,7 +1760,11 @@ typedef struct AVFormatContext { * via AVOptions (NO direct access). * Can be set to 0 to let avformat choose using a heuristic. */ +#if FF_API_PROBESIZE_32 int64_t max_analyze_duration2; +#else + int64_t max_analyze_duration; +#endif /** * Maximum size of the data read from input for determining @@ -1766,7 +1772,11 @@ typedef struct AVFormatContext { * Demuxing only, set by the caller before avformat_open_input() * via AVOptions (NO direct access). */ +#if FF_API_PROBESIZE_32 int64_t probesize2; +#else + int64_t probesize; +#endif /** * dump format separator.