Merge commit '443502aed8b814d883825e52e91e4f018955aa66'

[ffmpeg] / libavcodec / vdpau_h264.c

diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index 5d35680e6ffdd7c4cf1ade417cb0bcecba1bc702..c8307bcc47924e781d886d1b95459028b433e8fd 100644 (file)
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -209,10 +209,10 @@ static int vdpau_h264_init(AVCodecContext *avctx)
     uint32_t level = avctx->level;
 
     switch (avctx->profile & ~FF_PROFILE_H264_INTRA) {
-    case FF_PROFILE_H264_CONSTRAINED_BASELINE:
     case FF_PROFILE_H264_BASELINE:
         profile = VDP_DECODER_PROFILE_H264_BASELINE;
         break;
+    case FF_PROFILE_H264_CONSTRAINED_BASELINE:
     case FF_PROFILE_H264_MAIN:
         profile = VDP_DECODER_PROFILE_H264_MAIN;
         break;