Mercurial > libavcodec.hg

diff mpegvideo.c @ 9011:90c99bda19f5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Approved hunks for VAAPI / our new shiny hwaccel API by Gwenole Beauchesne gbeauchesne splitted desktop com
author michael
date Mon, 23 Feb 2009 13:35:52 +0000
parents 043574c5c153
children 0f95e4f0a3f5
line wrap: on
line diff
--- a/mpegvideo.c	Sun Feb 22 23:13:00 2009 +0000
+++ b/mpegvideo.c	Mon Feb 23 13:35:52 2009 +0000
@@ -955,7 +955,8 @@
     //just to make sure that all data is rendered.
     if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
         ff_xvmc_field_end(s);
-    }else if(!(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+    }else if(!s->avctx->hwaccel
+       && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
        && s->unrestricted_mv
        && s->current_picture.reference
        && !s->intra_only