[SCM] libav/experimental: av_vdpau_get_profile: mask out H.264 intra profile flag

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c
Author: Rémi Denis-Courmont <remi at remlab.net>
Date:   Tue Mar 4 19:13:09 2014 +0000

    av_vdpau_get_profile: mask out H.264 intra profile flag
    
    Signed-off-by: Janne Grunau <janne-libav at jannau.net>

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index d8a35ee..50a57d0 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -114,7 +114,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);

-- 
Libav/FFmpeg packaging