diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-06 17:58:33 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-05-28 22:04:56 +0200 |
| commit | 6d212599aa684f30511fb08ca30fe2378405304e (patch) | |
| tree | 9c6c298ebb355a0e8a3ebbe9738c188be5b21d8e | |
| parent | 7dba055bb0d31b2c79d9c3a66abb849a71417d3c (diff) | |
avformat: Provide a standard compliance flag
Provide f_strict for avconv usage.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavformat/avformat.h | 5 | ||||
| -rw-r--r-- | libavformat/options_table.h | 5 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 9bc3f1acdc..c77a6070c8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2013-12-xx API changes, most recent first: +2014-05-24 - xxxxxxx - lavf 55.19.0 - avformat.h + Add strict_std_compliance and related AVOptions to support experimental + muxing. + 2014-05-19 - xxxxxxx - lavf 55.18.0 - avformat.h Add av_stream_get_side_data() to access stream-level side data in the same way as av_packet_get_side_data(). diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f6b38d5778..b17c791eac 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1158,6 +1158,11 @@ typedef struct AVFormatContext { */ int64_t max_interleave_delta; + /** + * Allow non-standard and experimental extension + * @see AVCodecContext.strict_std_compliance + */ + int strict_std_compliance; /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 70194202d7..ac052c805b 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -60,6 +60,11 @@ static const AVOption avformat_options[] = { {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, D, "err_detect"}, {"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, D, "err_detect"}, {"max_interleave_delta", "maximum buffering duration for interleaving", OFFSET(max_interleave_delta), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT64_MAX, E }, +{"f_strict", "how strictly to follow the standards (deprecated; use strict, save via avconv)", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "strict"}, +{"strict", "how strictly to follow the standards", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "strict"}, +{"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, D|E, "strict"}, +{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_NORMAL }, INT_MIN, INT_MAX, D|E, "strict"}, +{"experimental", "allow non-standardized experimental variants", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, D|E, "strict"}, {NULL}, }; diff --git a/libavformat/version.h b/libavformat/version.h index 20a58d2222..0a9cb06f79 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 18 +#define LIBAVFORMAT_VERSION_MINOR 19 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |