diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
| commit | 9547e3eef36921f9937d7154048fd5eafe8d45fb (patch) | |
| tree | c827949a60acb27dcdc601f0e9d8fd6a449c6935 /libavcodec | |
| parent | c3b29023207850fa3b5b6b4dcb8e4940b86abb83 (diff) | |
| parent | f824535a4a79c260b59d3178b8d958217caffd78 (diff) | |
| download | ffmpeg-streaming-9547e3eef36921f9937d7154048fd5eafe8d45fb.zip ffmpeg-streaming-9547e3eef36921f9937d7154048fd5eafe8d45fb.tar.gz | |
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
vdpau: deprecate bitstream buffers within the hardware context
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.h | 8 | ||||
| -rw-r--r-- | libavcodec/vdpau_internal.h | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 91948e7..9d3128e 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -57,12 +57,14 @@ #define FF_API_CAP_VDPAU 1 #endif +#if FF_API_BUFS_VDPAU union AVVDPAUPictureInfo { VdpPictureInfoH264 h264; VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoVC1 vc1; VdpPictureInfoMPEG4Part2 mpeg4; }; +#endif /** * This structure is used to share data between the libavcodec library and @@ -88,11 +90,13 @@ typedef struct AVVDPAUContext { */ VdpDecoderRender *render; +#if FF_API_BUFS_VDPAU /** * VDPAU picture information * * Set by libavcodec. */ + attribute_deprecated union AVVDPAUPictureInfo info; /** @@ -100,6 +104,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated int bitstream_buffers_allocated; /** @@ -107,6 +112,7 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated int bitstream_buffers_used; /** @@ -115,7 +121,9 @@ typedef struct AVVDPAUContext { * * Set by libavcodec. */ + attribute_deprecated VdpBitstreamBuffer *bitstream_buffers; +#endif } AVVDPAUContext; #if FF_API_CAP_VDPAU diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 4806a43..001f17c 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -35,6 +35,15 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) return (uintptr_t)pic->f.data[3]; } +#if !FF_API_BUFS_VDPAU +union AVVDPAUPictureInfo { + VdpPictureInfoH264 h264; + VdpPictureInfoMPEG1Or2 mpeg; + VdpPictureInfoVC1 vc1; + VdpPictureInfoMPEG4Part2 mpeg4; +}; +#endif + struct vdpau_picture_context { /** * VDPAU picture information. diff --git a/libavcodec/version.h b/libavcodec/version.h index c0b9ff3..4b9a4b2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MINOR 22 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -94,5 +94,8 @@ #ifndef FF_API_CAP_VDPAU #define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_BUFS_VDPAU +#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |
