lavc: Add flag to allow profile mismatch with hardware decoding

(cherry picked from commit 64a5260c695dd8051509d3270295fd64eac56587)

Mark Thompson committed 9 years ago

Commit 49ae8a51 parent b658b533 files · +18 −1Browse files

Unified · Split

3 files

@@ -15,6 +15,9 @@ libavutil: 2015-08-28 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2017-06-14 - xxxxxxx - lavc 57.99.100 - avcodec.h
	19	+ Add AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH.
	20	+
18	21	2017-06-14 - xxxxxxx - lavu 55.65.100 - hwcontext.h
19	22	Add AV_HWDEVICE_TYPE_NONE, av_hwdevice_find_type_by_name(),
20	23	av_hwdevice_get_type_name() and av_hwdevice_iterate_types().

@@ -4001,6 +4001,20 @@ typedef struct AVHWAccel { · 4000 unmodified lines
4001	4001	*/
4002	4002	#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
4003	4003
	4004	+/**
	4005	+ * Hardware acceleration should still be attempted for decoding when the
	4006	+ * codec profile does not match the reported capabilities of the hardware.
	4007	+ *
	4008	+ * For example, this can be used to try to decode baseline profile H.264
	4009	+ * streams in hardware - it will often succeed, because many streams marked
	4010	+ * as baseline profile actually conform to constrained baseline profile.
	4011	+ *
	4012	+ * @warning If the stream is actually not supported then the behaviour is
	4013	+ * undefined, and may include returning entirely incorrect output
	4014	+ * while indicating success.
	4015	+ */
	4016	+#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
	4017	+
4004	4018	/**
4005	4019	* @}
4006	4020	*/

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	28	#include "libavutil/version.h"
29	29
30	30	#define LIBAVCODEC_VERSION_MAJOR 57
31		−#define LIBAVCODEC_VERSION_MINOR 98
	31	+#define LIBAVCODEC_VERSION_MINOR 99
32	32	#define LIBAVCODEC_VERSION_MICRO 100
33	33
34	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts