Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'

* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c': av_vdpau_get_profile: mask out H.264 intra profile flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · a44a27b5c8
parent d08bb065f2 eeaf4f3b87
commit a44a27b5c8
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@ -480,7 +480,7 @@ do {                        \
        default:                               return AVERROR(EINVAL);
        }
    case AV_CODEC_ID_H264:
-        switch (avctx->profile) {
+        switch (avctx->profile & ~FF_PROFILE_H264_INTRA) {
        case FF_PROFILE_H264_CONSTRAINED_BASELINE:
        case FF_PROFILE_H264_BASELINE:         PROFILE(VDP_DECODER_PROFILE_H264_BASELINE);
        case FF_PROFILE_H264_MAIN:             PROFILE(VDP_DECODER_PROFILE_H264_MAIN);