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/mpeg12.c | |
| parent | 1d14361dec7d6fcfaf1ed579ae9a5e8f9d84abab (diff) | |
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/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 343858289f..10e4632d9d 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -26,6 +26,7 @@ */ //#define DEBUG +#include "internal.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -1303,6 +1304,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ avctx->pix_fmt = mpeg_get_pixelformat(avctx); //until then pix_fmt may be changed right after codec init if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || + avctx->hwaccel || s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ) if( avctx->idct_algo == FF_IDCT_AUTO ) avctx->idct_algo = FF_IDCT_SIMPLE; |