diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:00 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:00 +0000 |
| commit | e0f58e39c45abf4fd830f745d31acc43183ac7e6 (patch) | |
| tree | b213a7d2fc4ea381825c1fab54822267ffc49b9c | |
| parent | fe3608d577be9d67fffe666c4e5967a11a491db2 (diff) | |
| download | ffmpeg-e0f58e39c45abf4fd830f745d31acc43183ac7e6.tar.gz | |
Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER,
the former depends upon the latter.
Originally committed as revision 19532 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 96055e664c..ad4125de8f 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3256,7 +3256,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, s->me.qpel_put= s->dsp.put_qpel_pixels_tab; s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; - if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER) + if ((CONFIG_VC1_VDPAU_DECODER) &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); else if (avctx->hwaccel) { |