diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 10:58:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 10:58:12 +0100 |
| commit | ab9ba8887705e3a1db946e7f992bd5cf411f1f04 (patch) | |
| tree | ba182dc06d54cd13990aac6ddeb1c778fde02776 /libavcodec | |
| parent | 39680caceebfc6abf09b17032048752c014e57a8 (diff) | |
| parent | 26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893 (diff) | |
| download | ffmpeg-ab9ba8887705e3a1db946e7f992bd5cf411f1f04.tar.gz | |
Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893':
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 5d35680e6f..c8307bcc47 100644 --- 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; |