aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vdpau.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-14 22:14:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-14 22:14:58 +0100
commit3f679f73a2eee1937bd58e6ec5739d29b1a05e7f (patch)
treeebf7db98d22e08a817094f58186c7b98fd38d07c /libavcodec/vdpau.c
parent0b30d186f1a2ddee583e7917cd0a48ca113849ab (diff)
parent8502c1e9ff9c1dbb6e467630c048d098f4064021 (diff)
downloadffmpeg-3f679f73a2eee1937bd58e6ec5739d29b1a05e7f.tar.gz
Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'
* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021': vdpau: add mapping for H.264 Extended profile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
-rw-r--r--libavcodec/vdpau.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 0fccdf03fd..33be4bed34 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -664,6 +664,9 @@ do { \
case FF_PROFILE_H264_CONSTRAINED_BASELINE:
case FF_PROFILE_H264_MAIN: PROFILE(H264_MAIN);
case FF_PROFILE_H264_HIGH: PROFILE(H264_HIGH);
+#ifdef VDP_DECODER_PROFILE_H264_EXTENDED
+ case FF_PROFILE_H264_EXTENDED: PROFILE(H264_EXTENDED);
+#endif
default: return AVERROR(EINVAL);
}
case AV_CODEC_ID_WMV3: