Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:04:51 +0000 (11:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:05:12 +0000 (11:05 +0100)
* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
  vdpau: return MAIN instead of BASELINE for H.264 CBP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau.c

index 41aea1c..f7116f4 100644 (file)
@@ -660,8 +660,8 @@ do {                        \
         }
     case AV_CODEC_ID_H264:
         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_CONSTRAINED_BASELINE:
         case FF_PROFILE_H264_MAIN:             PROFILE(VDP_DECODER_PROFILE_H264_MAIN);
         case FF_PROFILE_H264_HIGH:             PROFILE(VDP_DECODER_PROFILE_H264_HIGH);
         default:                               return AVERROR(EINVAL);