OSDN Git Service

vdpau: add mapping for H.264 Extended profile
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 13 Dec 2014 16:42:20 +0000 (18:42 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sun, 14 Dec 2014 17:29:27 +0000 (18:29 +0100)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/vdpau.c
libavcodec/vdpau_h264.c

index fd3ae62..1e891ed 100644 (file)
@@ -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:
index 4103328..d18a970 100644 (file)
@@ -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);
     }