aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRĂ©mi Denis-Courmont <remi@remlab.net>2014-10-26 21:33:58 +0200
committerAnton Khirnov <anton@khirnov.net>2014-10-28 07:06:33 +0100
commitce91b2eae6ea52fc1a7003566d26db20ca62d745 (patch)
treec92b07c00a1d9e72603a6436450974b009a3bf02
parent26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893 (diff)
downloadffmpeg-ce91b2eae6ea52fc1a7003566d26db20ca62d745.tar.gz
vdpau: return MAIN instead of BASELINE for H.264 CBP
This is the same as the previous change, but for applications using the old API (such as VLC 2.2). Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/vdpau.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 1d68e70b47..93b53dda13 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -287,8 +287,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);