---
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 2 ++
libavcodec/vdpau.h | 3 ++-
libavcodec/version.h | 5 ++++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 52672f5..0d87f04 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2012-10-22
API changes, most recent first:
+2013-07-xx - xxxxxxx - lavc 55.11.0 - avcodec.h
+ Deprecate CODEC_CAP_HWACCEL_VDPAU. Use CODEC_CAP_HWACCEL instead.
+
2013-07-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h
Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f4a10e1..57d53c2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -699,10 +699,12 @@ typedef struct RcOverride{
* This can be used to prevent truncation of the last audio samples.
*/
#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
/**
* Codec can export data for HW decoding (VDPAU).
*/
#define CODEC_CAP_HWACCEL_VDPAU 0x0080
+#endif
/**
* Codec can output multiple frames per AVPacket
* Normally demuxers return one frame at a time, demuxers which do not do
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index a589315..18efcaa 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -113,7 +113,7 @@ typedef struct AVVDPAUContext {
VdpBitstreamBuffer *bitstream_buffers;
} AVVDPAUContext;
-
+#if FF_API_CAP_VDPAU
/** @brief The videoSurface is used for rendering. */
#define FF_VDPAU_STATE_USED_FOR_RENDER 1
@@ -145,6 +145,7 @@ struct vdpau_render_state {
/** The user is responsible for freeing this buffer using av_freep(). */
VdpBitstreamBuffer *bitstream_buffers;
};
+#endif
/* @}*/
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 7c82519..ca98838 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,7 +27,7 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR 10
+#define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -64,5 +64,8 @@
#ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
#endif /* AVCODEC_VERSION_H */
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
