Both are only accessible through AVOptions.
Unified · Split
| @@ -15,6 +15,10 @@ libavutil: 2015-08-28 · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | API changes, most recent first: |
| 17 | 17 | |
| 18 | +2015-09-15 - lavf 57.2.100 - avformat.h | |
| 19 | + probesize and max_analyze_duration switched to 64bit, both | |
| 20 | + are only accessible through AVOptions | |
| 21 | + | |
| 18 | 22 | 2015-09-15 - lavf 57.1.100 - avformat.h |
| 19 | 23 | bit_rate was changed to 64bit, make sure you update any |
| 20 | 24 | printf() or other type sensitive code |
| @@ -1395,7 +1395,7 @@ typedef struct AVFormatContext { · 1394 unmodified lines | ||
| 1395 | 1395 | #define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. |
| 1396 | 1396 | #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats |
| 1397 | 1397 | |
| 1398 | −#if FF_API_PROBESIZE_32 | |
| 1398 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 1399 | 1399 | /** |
| 1400 | 1400 | * @deprecated deprecated in favor of probesize2 |
| 1401 | 1401 | */ |
| @@ -1759,7 +1759,7 @@ typedef struct AVFormatContext { · 357 unmodified lines | ||
| 1759 | 1759 | * via AVOptions (NO direct access). |
| 1760 | 1760 | * Can be set to 0 to let avformat choose using a heuristic. |
| 1761 | 1761 | */ |
| 1762 | −#if FF_API_PROBESIZE_32 | |
| 1762 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 1763 | 1763 | int64_t max_analyze_duration2; |
| 1764 | 1764 | #else |
| 1765 | 1765 | int64_t max_analyze_duration; |
| @@ -1771,7 +1771,7 @@ typedef struct AVFormatContext { · 5 unmodified lines | ||
| 1771 | 1771 | * Demuxing only, set by the caller before avformat_open_input() |
| 1772 | 1772 | * via AVOptions (NO direct access). |
| 1773 | 1773 | */ |
| 1774 | −#if FF_API_PROBESIZE_32 | |
| 1774 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 1775 | 1775 | int64_t probesize2; |
| 1776 | 1776 | #else |
| 1777 | 1777 | int64_t probesize; |
| @@ -2513,7 +2513,7 @@ static int mpegts_read_header(AVFormatContext *s) · 2512 unmodified lines | ||
| 2513 | 2513 | uint8_t buf[8 * 1024] = {0}; |
| 2514 | 2514 | int len; |
| 2515 | 2515 | int64_t pos, probesize = |
| 2516 | −#if FF_API_PROBESIZE_32 | |
| 2516 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 2517 | 2517 | s->probesize ? s->probesize : s->probesize2; |
| 2518 | 2518 | #else |
| 2519 | 2519 | s->probesize; |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | static const AVOption avformat_options[] = { |
| 37 | 37 | {"avioflags", NULL, OFFSET(avio_flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "avioflags"}, |
| 38 | 38 | {"direct", "reduce buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVIO_FLAG_DIRECT }, INT_MIN, INT_MAX, D|E, "avioflags"}, |
| 39 | −#if FF_API_PROBESIZE_32 | |
| 39 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 40 | 40 | {"probesize", "set probing size", OFFSET(probesize2), AV_OPT_TYPE_INT64, {.i64 = 5000000 }, 32, INT64_MAX, D}, |
| 41 | 41 | #else |
| 42 | 42 | {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT64, {.i64 = 5000000 }, 32, INT64_MAX, D}, |
| @@ -58,7 +58,7 @@ static const AVOption avformat_options[] = { · 15 unmodified lines | ||
| 58 | 58 | {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, |
| 59 | 59 | {"seek2any", "allow seeking to non-keyframes on demuxer level when supported", OFFSET(seek2any), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, D}, |
| 60 | 60 | {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, |
| 61 | −#if FF_API_PROBESIZE_32 | |
| 61 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 62 | 62 | {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration2), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, |
| 63 | 63 | #else |
| 64 | 64 | {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, |
| @@ -3085,14 +3085,14 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) · 3084 unmodified lines | ||
| 3085 | 3085 | // new streams might appear, no options for those |
| 3086 | 3086 | int orig_nb_streams = ic->nb_streams; |
| 3087 | 3087 | int flush_codecs; |
| 3088 | −#if FF_API_PROBESIZE_32 | |
| 3088 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 3089 | 3089 | int64_t max_analyze_duration = ic->max_analyze_duration2; |
| 3090 | 3090 | #else |
| 3091 | 3091 | int64_t max_analyze_duration = ic->max_analyze_duration; |
| 3092 | 3092 | #endif |
| 3093 | 3093 | int64_t max_stream_analyze_duration; |
| 3094 | 3094 | int64_t max_subtitle_analyze_duration; |
| 3095 | −#if FF_API_PROBESIZE_32 | |
| 3095 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 3096 | 3096 | int64_t probesize = ic->probesize2; |
| 3097 | 3097 | #else |
| 3098 | 3098 | int64_t probesize = ic->probesize; |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include "libavutil/version.h" |
| 31 | 31 | |
| 32 | 32 | #define LIBAVFORMAT_VERSION_MAJOR 57 |
| 33 | −#define LIBAVFORMAT_VERSION_MINOR 1 | |
| 33 | +#define LIBAVFORMAT_VERSION_MINOR 2 | |
| 34 | 34 | #define LIBAVFORMAT_VERSION_MICRO 100 |
| 35 | 35 | |
| 36 | 36 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| @@ -65,9 +65,6 @@ · 28 unmodified lines | ||
| 65 | 65 | #ifndef FF_API_URL_FEOF |
| 66 | 66 | #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58) |
| 67 | 67 | #endif |
| 68 | −#ifndef FF_API_PROBESIZE_32 | |
| 69 | −#define FF_API_PROBESIZE_32 (LIBAVFORMAT_VERSION_MAJOR < 58) | |
| 70 | −#endif | |
| 71 | 68 | |
| 72 | 69 | #ifndef FF_API_R_FRAME_RATE |
| 73 | 70 | #define FF_API_R_FRAME_RATE 1 |