[FFmpeg-cvslog] vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Tue Mar 26 22:45:40 2013 +0100| [757d85868b77c4fdec7b77a3b7de1faf16c031e8] | committer: Janne Grunau

vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=757d85868b77c4fdec7b77a3b7de1faf16c031e8
---

 libavcodec/mpeg12.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 6008f9c..0634de1 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);