diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:45:38 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:45:38 +0200 |
| commit | d0bf83ff1dd3a3858a299cc4795ede14b335cc1c (patch) | |
| tree | 3713068335c0d1a1d6a0720f7c5965915e8f5978 /libavcodec/vdpau.c | |
| parent | 4b7685b6c626a159e759a5167af11abef9c7802c (diff) | |
| parent | a41e5e192ed8f79f6607f978dee3205580ba5039 (diff) | |
| download | ffmpeg-d0bf83ff1dd3a3858a299cc4795ede14b335cc1c.tar.gz | |
Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'
* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039':
vdpau: fix constrained baseline fallback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index b5304664d6..60c7235bac 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -187,8 +187,7 @@ int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile, status = decoder_query_caps(vdctx->device, profile, &supported, &max_level, &max_mb, &max_width, &max_height); #ifdef VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE - if (status != VDP_STATUS_OK && profile == VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE) { - /* Run-time backward compatibility for libvdpau 0.8 and earlier */ + if ((status != VDP_STATUS_OK || supported != VDP_TRUE) && profile == VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE) { profile = VDP_DECODER_PROFILE_H264_MAIN; status = decoder_query_caps(vdctx->device, profile, &supported, &max_level, &max_mb, |