diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-06-25 19:14:23 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-06-25 19:14:23 +0000 |
| commit | ee0c00d3b43dcf53bca1a0a89ffab2d6140c811f (patch) | |
| tree | 7d75c8fb3aa8b207c46eaedbd5fa426bbca6b187 | |
| parent | 8176bd1a4689ff08b0e85984563ad8288110f1a7 (diff) | |
| download | ffmpeg-ee0c00d3b43dcf53bca1a0a89ffab2d6140c811f.tar.gz | |
use libmpeg2 idct to decode xvid videos unless the user forced some other idct
Originally committed as revision 3251 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 4394432e3d..31580e4dbf 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -623,7 +623,11 @@ retry: fprintf(f, "%d %d %f\n", buf_size, s->qscale, buf_size*(double)s->qscale); } #endif - + + if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & MM_MMX) && !(s->flags&CODEC_FLAG_BITEXACT)){ + avctx->idct_algo= FF_IDCT_LIBMPEG2MMX; + avctx->width= 0; // force reinit + } /* After H263 & mpeg4 header decode we have the height, width,*/ /* and other parameters. So then we could init the picture */ /* FIXME: By the way H263 decoder is evolving it should have */ |