aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2013-03-26 22:45:40 +0100
committerJanne Grunau <janne-libav@jannau.net>2013-03-26 22:53:29 +0100
commit757d85868b77c4fdec7b77a3b7de1faf16c031e8 (patch)
tree03e38393e6c9f9a0c14b93a7d9175a3ef425f5d9
parentd767e2f969933b4e450ed4e69ea2bf8ca864838c (diff)
downloadffmpeg-757d85868b77c4fdec7b77a3b7de1faf16c031e8.tar.gz
vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled
-rw-r--r--libavcodec/mpeg12.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 6008f9c5a0..0634de111d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2240,7 +2240,8 @@ static int decode_chunks(AVCodecContext *avctx,
s2->er.error_count += s2->thread_context[i]->er.error_count;
}
- if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
+ && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
ret = slice_end(avctx, picture);