RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094' 

* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 13:54:05 +02:00
parent 4ee0984341 549294fbbe
commit 3b805dcaa9
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -15,6 +15,10 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2013-08-xx - xxxxxxx - lavc 55.12.0 - avcodec.h
Deprecate the CODEC_CAP_HWACCEL_VDPAU codec capability. Use CODEC_CAP_HWACCEL
and select the AV_PIX_FMT_VDPAU format with get_format() instead.
2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h 2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h
Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead. Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead.

2
libavcodec/avcodec.h
View File

@ -762,10 +762,12 @@ typedef struct RcOverride{
* This can be used to prevent truncation of the last audio samples. * This can be used to prevent truncation of the last audio samples.
*/ */
#define CODEC_CAP_SMALL_LAST_FRAME 0x0040 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
#if FF_API_CAP_VDPAU
/** /**
* Codec can export data for HW decoding (VDPAU). * Codec can export data for HW decoding (VDPAU).
*/ */
#define CODEC_CAP_HWACCEL_VDPAU 0x0080 #define CODEC_CAP_HWACCEL_VDPAU 0x0080
#endif
/** /**
* Codec can output multiple frames per AVPacket * Codec can output multiple frames per AVPacket
* Normally demuxers return one frame at a time, demuxers which do not do * Normally demuxers return one frame at a time, demuxers which do not do

3
libavcodec/vdpau.h
View File

@ -114,7 +114,7 @@ typedef struct AVVDPAUContext {
VdpBitstreamBuffer *bitstream_buffers; VdpBitstreamBuffer *bitstream_buffers;
} AVVDPAUContext; } AVVDPAUContext;
#if FF_API_CAP_VDPAU
/** @brief The videoSurface is used for rendering. */ /** @brief The videoSurface is used for rendering. */
#define FF_VDPAU_STATE_USED_FOR_RENDER 1 #define FF_VDPAU_STATE_USED_FOR_RENDER 1
@ -153,6 +153,7 @@ struct vdpau_render_state {
union AVVDPAUPictureInfo info; union AVVDPAUPictureInfo info;
#endif #endif
}; };
#endif
/* @}*/ /* @}*/

5
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 20 #define LIBAVCODEC_VERSION_MINOR 21
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -91,5 +91,8 @@
#ifndef FF_API_LOWRES #ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_CAP_VDPAU
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */