diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-02-23 13:35:52 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-02-23 13:35:52 +0000 |
| commit | c269cf68a0d1579f41e082288072e3f182ef2b5f (patch) | |
| tree | e853fde01f405ae55d75f11c3dd422181f5ba0d9 /libavcodec/mpegvideo.c | |
| parent | 1d14361dec7d6fcfaf1ed579ae9a5e8f9d84abab (diff) | |
| download | ffmpeg-c269cf68a0d1579f41e082288072e3f182ef2b5f.tar.gz | |
Approved hunks for VAAPI / our new shiny hwaccel API
by Gwenole Beauchesne gbeauchesne splitted desktop com
Originally committed as revision 17539 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e367874d26..168fbacddd 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -955,7 +955,8 @@ void MPV_frame_end(MpegEncContext *s) //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 |