diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 11:48:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 11:49:27 +0100 |
| commit | a44a27b5c81759d908ee85908b4a136971c5014e (patch) | |
| tree | a115d70638fbc10c3ccc3f723373307e0634bca4 /libavcodec | |
| parent | d08bb065f2acad0f77c53dacfb25c2885d8cc864 (diff) | |
| parent | eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c (diff) | |
Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
av_vdpau_get_profile: mask out H.264 intra profile flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 e294e490db..6f9a55a254 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -480,7 +480,7 @@ do { \ default: return AVERROR(EINVAL); } case AV_CODEC_ID_H264: - switch (avctx->profile) { + 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_MAIN: PROFILE(VDP_DECODER_PROFILE_H264_MAIN); |