diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 22:22:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 22:23:53 +0100 |
commit | 27f2e211aa6d0f9b5b4e4c04d3a3567423085d49 (patch) | |
tree | c0ec7ce6076e8ecf338c1c67d738deac2aee55f9 /libavcodec/vdpau_h264.c | |
parent | 3f679f73a2eee1937bd58e6ec5739d29b1a05e7f (diff) | |
parent | 559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816 (diff) | |
download | ffmpeg-streaming-27f2e211aa6d0f9b5b4e4c04d3a3567423085d49.zip ffmpeg-streaming-27f2e211aa6d0f9b5b4e4c04d3a3567423085d49.tar.gz |
Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'
* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
vdpau: add mapping for H.264 Constrained Baseline profile and fallback
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_h264.c')
-rw-r--r-- | libavcodec/vdpau_h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index d9a3a52..0b2c046 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -213,6 +213,10 @@ static int vdpau_h264_init(AVCodecContext *avctx) profile = VDP_DECODER_PROFILE_H264_BASELINE; break; case FF_PROFILE_H264_CONSTRAINED_BASELINE: +#ifdef VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE + profile = VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE; + break; +#endif case FF_PROFILE_H264_MAIN: profile = VDP_DECODER_PROFILE_H264_MAIN; break; |