vdpau: deprecate VDPAU codec capability

Rémi Denis-Courmont committed 13 years ago

Commit 549294f1 parent a0ad5d04 files · +12 −2Browse files

Unified · Split

4 files

doc/APIchanges +4 −0
libavcodec/avcodec.h +2 −0
libavcodec/vdpau.h +2 −1
libavcodec/version.h +4 −1

doc/APIchanges+4−0

@@ -13,6 +13,10 @@ libavutil: 2012-10-22 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2013-08-xx - xxxxxxx - lavc 55.12.0 - avcodec.h
	17	+ Deprecate the CODEC_CAP_HWACCEL_VDPAU codec capability. Use CODEC_CAP_HWACCEL
	18	+ and select the AV_PIX_FMT_VDPAU format with get_format() instead.
	19	+
16	20	2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h
17	21	Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead.
18	22

libavcodec/avcodec.h+2−0

@@ -700,10 +700,12 @@ typedef struct RcOverride{ · 699 unmodified lines
700	700	* This can be used to prevent truncation of the last audio samples.
701	701	*/
702	702	#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
	703	+#if FF_API_CAP_VDPAU
703	704	/**
704	705	* Codec can export data for HW decoding (VDPAU).
705	706	*/
706	707	#define CODEC_CAP_HWACCEL_VDPAU 0x0080
	708	+#endif
707	709	/**
708	710	* Codec can output multiple frames per AVPacket
709	711	* Normally demuxers return one frame at a time, demuxers which do not do

libavcodec/vdpau.h+2−1

@@ -113,7 +113,7 @@ typedef struct AVVDPAUContext { · 112 unmodified lines
113	113	VdpBitstreamBuffer *bitstream_buffers;
114	114	} AVVDPAUContext;
115	115
116		−
	116	+#if FF_API_CAP_VDPAU
117	117	/** @brief The videoSurface is used for rendering. */
118	118	#define FF_VDPAU_STATE_USED_FOR_RENDER 1
119	119
@@ -145,6 +145,7 @@ struct vdpau_render_state { · 25 unmodified lines
145	145	/** The user is responsible for freeing this buffer using av_freep(). */
146	146	VdpBitstreamBuffer *bitstream_buffers;
147	147	};
	148	+#endif
148	149
149	150	/* @}*/
150	151

libavcodec/version.h+4−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	*/
28	28
29	29	#define LIBAVCODEC_VERSION_MAJOR 55
30		−#define LIBAVCODEC_VERSION_MINOR 11
	30	+#define LIBAVCODEC_VERSION_MINOR 12
31	31	#define LIBAVCODEC_VERSION_MICRO 0
32	32
33	33	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -64,5 +64,8 @@ · 30 unmodified lines
64	64	#ifndef FF_API_LOWRES
65	65	#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
66	66	#endif
	67	+#ifndef FF_API_CAP_VDPAU
	68	+#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
	69	+#endif
67	70
68	71	#endif /* AVCODEC_VERSION_H */