diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2014-12-13 18:42:20 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-14 18:29:27 +0100 |
| commit | 8502c1e9ff9c1dbb6e467630c048d098f4064021 (patch) | |
| tree | 2f41110ccaf7e3a7cb1839ce28be4824675e51e8 | |
| parent | 8b51bcfed75721e0d20832e5a90e1d585318c9d9 (diff) | |
| download | ffmpeg-8502c1e9ff9c1dbb6e467630c048d098f4064021.tar.gz | |
vdpau: add mapping for H.264 Extended profile
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/vdpau.c | 3 | ||||
| -rw-r--r-- | libavcodec/vdpau_h264.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index fd3ae620da..1e891ed4ac 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -291,6 +291,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: diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 41033284be..d18a970fc1 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -219,6 +219,11 @@ static int vdpau_h264_init(AVCodecContext *avctx) case FF_PROFILE_H264_HIGH: profile = VDP_DECODER_PROFILE_H264_HIGH; break; +#ifdef VDP_DECODER_PROFILE_H264_EXTENDED + case FF_PROFILE_H264_EXTENDED: + profile = VDP_DECODER_PROFILE_H264_EXTENDED; + break; +#endif default: return AVERROR(ENOTSUP); } |