diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-02 00:50:39 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-02 00:50:39 +0200 |
| commit | ecf94986c8ba7c9fb4f674ee93e3be5f73d8ccdd (patch) | |
| tree | 568759ea5a32af0512e60123566cc9531248e752 | |
| parent | 2a0bd2bfc957abe3fab97cc27e6d997099082841 (diff) | |
| download | ffmpeg-ecf94986c8ba7c9fb4f674ee93e3be5f73d8ccdd.tar.gz | |
Fix compilation with --disable-vdpau
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1301,9 +1301,11 @@ 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_crystalhd_decoder_select="crystalhd" 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_crystalhd_decoder_select="crystalhd" mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index bfe0d9e68e..774ac83a3e 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2331,7 +2331,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)) { |