generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'

Browse Source 
* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-14 22:14:36 +01:00
commit 3f679f73a2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vdpau.c
View File

@ -664,6 +664,9 @@ do { \
case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_H264_CONSTRAINED_BASELINE:
case FF_PROFILE_H264_MAIN: PROFILE(H264_MAIN); case FF_PROFILE_H264_MAIN: PROFILE(H264_MAIN);
case FF_PROFILE_H264_HIGH: PROFILE(H264_HIGH); 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); default: return AVERROR(EINVAL);
} }
case AV_CODEC_ID_WMV3: case AV_CODEC_ID_WMV3:

5
libavcodec/vdpau_h264.c
View File

@ -219,6 +219,11 @@ static int vdpau_h264_init(AVCodecContext *avctx)
case FF_PROFILE_H264_HIGH: case FF_PROFILE_H264_HIGH:
profile = VDP_DECODER_PROFILE_H264_HIGH; profile = VDP_DECODER_PROFILE_H264_HIGH;
break; break;
#ifdef VDP_DECODER_PROFILE_H264_EXTENDED
case FF_PROFILE_H264_EXTENDED:
profile = VDP_DECODER_PROFILE_H264_EXTENDED;
break;
#endif
default: default:
return AVERROR(ENOTSUP); return AVERROR(ENOTSUP);
} }