diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:04:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:05:12 +0100 |
| commit | dd5123a04c67f74024128447e8ca9642241d6d45 (patch) | |
| tree | b826779137aa92bc258fed7fa318c8aa0b1e799f | |
| parent | ab9ba8887705e3a1db946e7f992bd5cf411f1f04 (diff) | |
| parent | ce91b2eae6ea52fc1a7003566d26db20ca62d745 (diff) | |
| download | ffmpeg-dd5123a04c67f74024128447e8ca9642241d6d45.tar.gz | |
Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
vdpau: return MAIN instead of BASELINE for H.264 CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vdpau.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 41aea1c215..f7116f4036 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -660,8 +660,8 @@ do { \ } case AV_CODEC_ID_H264: switch (avctx->profile & ~FF_PROFILE_H264_INTRA) { - case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_H264_BASELINE: PROFILE(VDP_DECODER_PROFILE_H264_BASELINE); + case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_H264_MAIN: PROFILE(VDP_DECODER_PROFILE_H264_MAIN); case FF_PROFILE_H264_HIGH: PROFILE(VDP_DECODER_PROFILE_H264_HIGH); default: return AVERROR(EINVAL); |