From: Carl Eugen Hoyos <[email protected]>
Signed-off-by: Anton Khirnov <[email protected]>
---
configure | 2 ++
libavcodec/mpeg12.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 2a1883b..27450a6 100755
--- a/configure
+++ b/configure
@@ -1305,8 +1305,10 @@ mpeg4_decoder_select="h263_decoder mpeg4video_parser"
mpeg4_encoder_select="h263_encoder"
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
+mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder"
mpeg2_dxva2_hwaccel_deps="dxva2api_h"
mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder"
+mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder"
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 0c3091a..b8a1738 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2328,7 +2328,7 @@ static int decode_chunks(AVCodecContext *avctx,
s2->error_count += s2->thread_context[i]->error_count;
}
- if (uses_vdpau(avctx))
+ if (CONFIG_MPEG_VDPAU_DECODER && uses_vdpau(avctx))
ff_vdpau_mpeg_picture_complete(s2, buf, buf_size,
s->slice_count);
if (slice_end(avctx, picture)) {
--
1.7.5.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
