mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'
* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039': vdpau: fix constrained baseline fallback Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
d0bf83ff1d
|
@ -187,8 +187,7 @@ int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
|
||||||
status = decoder_query_caps(vdctx->device, profile, &supported, &max_level,
|
status = decoder_query_caps(vdctx->device, profile, &supported, &max_level,
|
||||||
&max_mb, &max_width, &max_height);
|
&max_mb, &max_width, &max_height);
|
||||||
#ifdef VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE
|
#ifdef VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE
|
||||||
if (status != VDP_STATUS_OK && profile == VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE) {
|
if ((status != VDP_STATUS_OK || supported != VDP_TRUE) && profile == VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE) {
|
||||||
/* Run-time backward compatibility for libvdpau 0.8 and earlier */
|
|
||||||
profile = VDP_DECODER_PROFILE_H264_MAIN;
|
profile = VDP_DECODER_PROFILE_H264_MAIN;
|
||||||
status = decoder_query_caps(vdctx->device, profile, &supported,
|
status = decoder_query_caps(vdctx->device, profile, &supported,
|
||||||
&max_level, &max_mb,
|
&max_level, &max_mb,
|
||||||
|
|
Loading…
Reference in New Issue