Unified · Split
| @@ -13,6 +13,10 @@ libavutil: 2012-10-22 · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | API changes, most recent first: | 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 | 2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h | 20 | 2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h |
| 17 | Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead. | 21 | Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead. |
| 18 | 22 | ||
| @@ -700,10 +700,12 @@ typedef struct RcOverride{ · 699 unmodified lines | |||
| 700 | * This can be used to prevent truncation of the last audio samples. | 700 | * This can be used to prevent truncation of the last audio samples. |
| 701 | */ | 701 | */ |
| 702 | #define CODEC_CAP_SMALL_LAST_FRAME 0x0040 | 702 | #define CODEC_CAP_SMALL_LAST_FRAME 0x0040 |
| 703 | #if FF_API_CAP_VDPAU | ||
| 703 | /** | 704 | /** |
| 704 | * Codec can export data for HW decoding (VDPAU). | 705 | * Codec can export data for HW decoding (VDPAU). |
| 705 | */ | 706 | */ |
| 706 | #define CODEC_CAP_HWACCEL_VDPAU 0x0080 | 707 | #define CODEC_CAP_HWACCEL_VDPAU 0x0080 |
| 708 | #endif | ||
| 707 | /** | 709 | /** |
| 708 | * Codec can output multiple frames per AVPacket | 710 | * Codec can output multiple frames per AVPacket |
| 709 | * Normally demuxers return one frame at a time, demuxers which do not do | 711 | * Normally demuxers return one frame at a time, demuxers which do not do |
| @@ -113,7 +113,7 @@ typedef struct AVVDPAUContext { · 112 unmodified lines | |||
| 113 | VdpBitstreamBuffer *bitstream_buffers; | 113 | VdpBitstreamBuffer *bitstream_buffers; |
| 114 | } AVVDPAUContext; | 114 | } AVVDPAUContext; |
| 115 | 115 | ||
| 116 | 116 | #if FF_API_CAP_VDPAU | |
| 117 | /** @brief The videoSurface is used for rendering. */ | 117 | /** @brief The videoSurface is used for rendering. */ |
| 118 | #define FF_VDPAU_STATE_USED_FOR_RENDER 1 | 118 | #define FF_VDPAU_STATE_USED_FOR_RENDER 1 |
| 119 | 119 | ||
| @@ -145,6 +145,7 @@ struct vdpau_render_state { · 25 unmodified lines | |||
| 145 | /** The user is responsible for freeing this buffer using av_freep(). */ | 145 | /** The user is responsible for freeing this buffer using av_freep(). */ |
| 146 | VdpBitstreamBuffer *bitstream_buffers; | 146 | VdpBitstreamBuffer *bitstream_buffers; |
| 147 | }; | 147 | }; |
| 148 | #endif | ||
| 148 | 149 | ||
| 149 | /* @}*/ | 150 | /* @}*/ |
| 150 | 151 | ||
| @@ -27,7 +27,7 @@ · 26 unmodified lines | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #define LIBAVCODEC_VERSION_MAJOR 55 | 29 | #define LIBAVCODEC_VERSION_MAJOR 55 |
| 30 | #define LIBAVCODEC_VERSION_MINOR 11 | 30 | #define LIBAVCODEC_VERSION_MINOR 12 |
| 31 | #define LIBAVCODEC_VERSION_MICRO 0 | 31 | #define LIBAVCODEC_VERSION_MICRO 0 |
| 32 | 32 | ||
| 33 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 33 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| @@ -64,5 +64,8 @@ · 30 unmodified lines | |||
| 64 | #ifndef FF_API_LOWRES | 64 | #ifndef FF_API_LOWRES |
| 65 | #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) | 65 | #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) |
| 66 | #endif | 66 | #endif |
| 67 | #ifndef FF_API_CAP_VDPAU | ||
| 68 | #define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) | ||
| 69 | #endif | ||
| 67 | 70 | ||
| 68 | #endif /* AVCODEC_VERSION_H */ | 71 | #endif /* AVCODEC_VERSION_H */ |