diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:19:49 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:19:49 +0200 |
| commit | 670d8ecfae5201f8c2d5693495c2f763cbbc2d72 (patch) | |
| tree | 9bb894f5e6a9b39eca1c8d69e0f3848de7aefe8a /libavformat/avformat.h | |
| parent | 0cb6c0ec488e324443b49b36f1224d3e5af420c4 (diff) | |
| download | ffmpeg-670d8ecfae5201f8c2d5693495c2f763cbbc2d72.tar.gz | |
lavf: Remove probesize32 and max_analyze_duration32 on version bump.
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e83a374f6d..4068ab6a56 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. |