Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'

* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893': vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · ab9ba88877
parent 39680cacee 26ab504ad8
commit ab9ba88877
1 changed files with 1 additions and 1 deletions
--- 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;