Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'
* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021': vdpau: add mapping for H.264 Extended profile Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3f679f73a2
@ -664,6 +664,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:
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user