Browse Source

Fix compilation with --disable-vdpau

tags/n0.8
Carl Eugen Hoyos 14 years ago
parent
commit
ecf94986c8
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      configure
  2. +1
    -1
      libavcodec/mpeg12.c

+ 2
- 0
configure View File

@@ -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"


+ 1
- 1
libavcodec/mpeg12.c View File

@@ -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)) {


Loading…
Cancel
Save