diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
| commit | 712a40b59a0f451a558d88db1f9f124463016f97 (patch) | |
| tree | 82bc80e9b7a5ba09c01acf205c8ac1e20c44914f /src/libffmpeg/libavcodec/h263dec.c | |
| parent | 640063a719556f8569fe848528b39660c6fc31a6 (diff) | |
| download | xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.gz xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.bz2 | |
big ffmpeg update
it is likely to break, so please keep both pieces
CVS patchset: 7767
CVS date: 2005/10/23 02:11:16
Diffstat (limited to 'src/libffmpeg/libavcodec/h263dec.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/h263dec.c b/src/libffmpeg/libavcodec/h263dec.c index b51ce5f0c..87e11794e 100644 --- a/src/libffmpeg/libavcodec/h263dec.c +++ b/src/libffmpeg/libavcodec/h263dec.c @@ -636,9 +636,9 @@ retry: } #endif -#ifdef HAVE_MMX +#if defined(HAVE_MMX) && defined(CONFIG_GPL) 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->idct_algo= FF_IDCT_XVIDMMX; avctx->coded_width= 0; // force reinit } #endif |