aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/pixdesc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 13:45:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 13:45:21 +0200
commit4ee0984341d89c657ebdd835483bbe3ea48e9c19 (patch)
tree7df0914957f1708ac23cd0b6cc8f4f8a8b1bbf24 /libavutil/pixdesc.c
parentbf36dc50ea448999c8f8c7a35f6139a7040f6275 (diff)
parenta0ad5d011318f951ecd4c9ffe1829518c9533909 (diff)
downloadffmpeg-4ee0984341d89c657ebdd835483bbe3ea48e9c19.tar.gz
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909': vdpau: deprecate old codec-specific pixel formats Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
-rw-r--r--libavutil/pixdesc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 2fc8918fea..e866db2118 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -855,6 +855,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
+#if FF_API_VDPAU
[AV_PIX_FMT_VDPAU_H264] = {
.name = "vdpau_h264",
.log2_chroma_w = 1,
@@ -891,6 +892,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_h = 1,
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
+#endif
[AV_PIX_FMT_RGB48BE] = {
.name = "rgb48be",
.nb_components = 3,