ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Mon Mar 27 20:45:21 2017 +0100| [64a5260c695dd8051509d3270295fd64eac56587] | committer: Mark Thompson
lavc: Add flag to allow profile mismatch with hardware decoding > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64a5260c695dd8051509d3270295fd64eac56587 --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 14 ++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index a0ca3b7ac0..58d59dd08c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2017-03-23 API changes, most recent first: +2017-04-26 - xxxxxxx - lavc 58.3.1 - avcodec.h + Add AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH. + 2017-03-xx - xxxxxxx - lavc 57.37.0 - avcodec.h Add AVCodecContext.hwaccel_flags field. This will control some hwaccels at a later point. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3118b10e9b..162f1abe4b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3006,6 +3006,20 @@ typedef struct AVHWAccel { #define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1) /** + * Hardware acceleration should still be attempted for decoding when the + * codec profile does not match the reported capabilities of the hardware. + * + * For example, this can be used to try to decode baseline profile H.264 + * streams in hardware - it will often succeed, because many streams marked + * as baseline profile actually conform to constrained baseline profile. + * + * @warning If the stream is actually not supported then the behaviour is + * undefined, and may include returning entirely incorrect output + * while indicating success. + */ +#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2) + +/** * @} */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 2a61bbd718..88f17a1f78 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
