Unified · Split
| @@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines | |||
| 15 | 15 | ||
| 16 | API changes, most recent first: | 16 | API changes, most recent first: |
| 17 | 17 | ||
| 18 | 2014-06-10 - xxxxxxx - lavf 55.43.100 - avformat.h | ||
| 19 | New field int64_t max_analyze_duration2 instead of deprecated | ||
| 20 | int max_analyze_duration. | ||
| 21 | |||
| 18 | 2014-05-30 - xxxxxxx - lavu 52.89.100 - opt.h | 22 | 2014-05-30 - xxxxxxx - lavu 52.89.100 - opt.h |
| 19 | Add av_opt_copy() | 23 | Add av_opt_copy() |
| 20 | 24 | ||
| @@ -1288,11 +1288,9 @@ typedef struct AVFormatContext { · 1287 unmodified lines | |||
| 1288 | unsigned int probesize; | 1288 | unsigned int probesize; |
| 1289 | 1289 | ||
| 1290 | /** | 1290 | /** |
| 1291 | * Maximum duration (in AV_TIME_BASE units) of the data read | 1291 | * @deprecated deprecated in favor of max_analyze_duration2 |
| 1292 | * from input in avformat_find_stream_info(). | ||
| 1293 | * Demuxing only, set by the caller before avformat_find_stream_info(). | ||
| 1294 | * Can be set to 0 to let avformat choose using a heuristic. | ||
| 1295 | */ | 1292 | */ |
| 1293 | attribute_deprecated | ||
| 1296 | int max_analyze_duration; | 1294 | int max_analyze_duration; |
| 1297 | 1295 | ||
| 1298 | const uint8_t *key; | 1296 | const uint8_t *key; |
| @@ -1649,6 +1647,15 @@ typedef struct AVFormatContext { · 350 unmodified lines | |||
| 1649 | * Muxing: set by user via AVOptions (NO direct access) | 1647 | * Muxing: set by user via AVOptions (NO direct access) |
| 1650 | */ | 1648 | */ |
| 1651 | int64_t output_ts_offset; | 1649 | int64_t output_ts_offset; |
| 1650 | |||
| 1651 | /** | ||
| 1652 | * Maximum duration (in AV_TIME_BASE units) of the data read | ||
| 1653 | * from input in avformat_find_stream_info(). | ||
| 1654 | * Demuxing only, set by the caller before avformat_find_stream_info() | ||
| 1655 | * via AVOptions (NO direct access). | ||
| 1656 | * Can be set to 0 to let avformat choose using a heuristic. | ||
| 1657 | */ | ||
| 1658 | int64_t max_analyze_duration2; | ||
| 1652 | } AVFormatContext; | 1659 | } AVFormatContext; |
| 1653 | 1660 | ||
| 1654 | int av_format_get_probe_score(const AVFormatContext *s); | 1661 | int av_format_get_probe_score(const AVFormatContext *s); |
| @@ -53,7 +53,7 @@ static const AVOption avformat_options[] = { · 52 unmodified lines | |||
| 53 | {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, | 53 | {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, |
| 54 | {"seek2any", "allow seeking to non-keyframes on demuxer level when supported", OFFSET(seek2any), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, D}, | 54 | {"seek2any", "allow seeking to non-keyframes on demuxer level when supported", OFFSET(seek2any), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, D}, |
| 55 | {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, | 55 | {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, |
| 56 | {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, D}, | 56 | {"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}, |
| 57 | {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, | 57 | {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, |
| 58 | {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), AV_OPT_TYPE_INT, {.i64 = 1<<20 }, 0, INT_MAX, D}, | 58 | {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), AV_OPT_TYPE_INT, {.i64 = 1<<20 }, 0, INT_MAX, D}, |
| 59 | {"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), AV_OPT_TYPE_INT, {.i64 = 3041280 }, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */ | 59 | {"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), AV_OPT_TYPE_INT, {.i64 = 3041280 }, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */ |
| @@ -3095,7 +3095,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) · 3094 unmodified lines | |||
| 3095 | // new streams might appear, no options for those | 3095 | // new streams might appear, no options for those |
| 3096 | int orig_nb_streams = ic->nb_streams; | 3096 | int orig_nb_streams = ic->nb_streams; |
| 3097 | int flush_codecs = ic->probesize > 0; | 3097 | int flush_codecs = ic->probesize > 0; |
| 3098 | int max_analyze_duration = ic->max_analyze_duration; | 3098 | int64_t max_analyze_duration = ic->max_analyze_duration2; |
| 3099 | if (!max_analyze_duration) | ||
| 3100 | max_analyze_duration = ic->max_analyze_duration; | ||
| 3099 | 3101 | ||
| 3100 | if (!max_analyze_duration) { | 3102 | if (!max_analyze_duration) { |
| 3101 | if (!strcmp(ic->iformat->name, "flv") && !(ic->ctx_flags & AVFMTCTX_NOHEADER)) { | 3103 | if (!strcmp(ic->iformat->name, "flv") && !(ic->ctx_flags & AVFMTCTX_NOHEADER)) { |
| @@ -3317,7 +3319,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) · 215 unmodified lines | |||
| 3317 | t = FFMAX(t, av_rescale_q(st->info->fps_last_dts - st->info->fps_first_dts, st->time_base, AV_TIME_BASE_Q)); | 3319 | t = FFMAX(t, av_rescale_q(st->info->fps_last_dts - st->info->fps_first_dts, st->time_base, AV_TIME_BASE_Q)); |
| 3318 | 3320 | ||
| 3319 | if (t >= max_analyze_duration) { | 3321 | if (t >= max_analyze_duration) { |
| 3320 | av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %d reached at %"PRId64" microseconds\n", | 3322 | av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %"PRId64" reached at %"PRId64" microseconds\n", |
| 3321 | max_analyze_duration, | 3323 | max_analyze_duration, |
| 3322 | t); | 3324 | t); |
| 3323 | break; | 3325 | break; |
| @@ -30,8 +30,8 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/version.h" | 30 | #include "libavutil/version.h" |
| 31 | 31 | ||
| 32 | #define LIBAVFORMAT_VERSION_MAJOR 55 | 32 | #define LIBAVFORMAT_VERSION_MAJOR 55 |
| 33 | #define LIBAVFORMAT_VERSION_MINOR 42 | 33 | #define LIBAVFORMAT_VERSION_MINOR 43 |
| 34 | #define LIBAVFORMAT_VERSION_MICRO 101 | 34 | #define LIBAVFORMAT_VERSION_MICRO 100 |
| 35 | 35 | ||
| 36 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 36 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 37 | LIBAVFORMAT_VERSION_MINOR, \ | 37 | LIBAVFORMAT_VERSION_MINOR, \ |