From b290972b8ff82272d4905166f8f0cbb3a6c49ff8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 15 Sep 2015 17:36:38 +0200 Subject: lavf: Switch probesize and max_analyze_duration to 64bit. Both are only accessible through AVOptions. --- libavformat/avformat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/avformat.h') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 825e6365e5..57dc62e344 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1395,7 +1395,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 +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI /** * @deprecated deprecated in favor of probesize2 */ @@ -1759,7 +1759,7 @@ 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 +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int64_t max_analyze_duration2; #else int64_t max_analyze_duration; @@ -1771,7 +1771,7 @@ typedef struct AVFormatContext { * Demuxing only, set by the caller before avformat_open_input() * via AVOptions (NO direct access). */ -#if FF_API_PROBESIZE_32 +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI int64_t probesize2; #else int64_t probesize; -- cgit v1.2.3