Mercurial > libavcodec.hg
comparison mpeg12.c @ 9011:90c99bda19f5 libavcodec
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 | b595a8a59967 |
children | bcf716c58be4 |
comparison
equal
deleted
inserted
replaced
9010:b6a47d0b6b63 | 9011:90c99bda19f5 |
---|---|
24 * @file libavcodec/mpeg12.c | 24 * @file libavcodec/mpeg12.c |
25 * MPEG-1/2 decoder | 25 * MPEG-1/2 decoder |
26 */ | 26 */ |
27 | 27 |
28 //#define DEBUG | 28 //#define DEBUG |
29 #include "internal.h" | |
29 #include "avcodec.h" | 30 #include "avcodec.h" |
30 #include "dsputil.h" | 31 #include "dsputil.h" |
31 #include "mpegvideo.h" | 32 #include "mpegvideo.h" |
32 | 33 |
33 #include "mpeg12.h" | 34 #include "mpeg12.h" |
1301 }//MPEG-2 | 1302 }//MPEG-2 |
1302 | 1303 |
1303 avctx->pix_fmt = mpeg_get_pixelformat(avctx); | 1304 avctx->pix_fmt = mpeg_get_pixelformat(avctx); |
1304 //until then pix_fmt may be changed right after codec init | 1305 //until then pix_fmt may be changed right after codec init |
1305 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || | 1306 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT || |
1307 avctx->hwaccel || | |
1306 s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ) | 1308 s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ) |
1307 if( avctx->idct_algo == FF_IDCT_AUTO ) | 1309 if( avctx->idct_algo == FF_IDCT_AUTO ) |
1308 avctx->idct_algo = FF_IDCT_SIMPLE; | 1310 avctx->idct_algo = FF_IDCT_SIMPLE; |
1309 | 1311 |
1310 /* Quantization matrices may need reordering | 1312 /* Quantization matrices may need reordering |