diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-06-19 00:47:19 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-06-19 00:47:19 +0000 |
| commit | 6f3b07176ae833429586bf9d27c8477db9efa7a7 (patch) | |
| tree | acba2593ed69e5a2aaa96aea9215948459d8ea8f /src/libffmpeg/libavcodec/i386 | |
| parent | c52df867db2f177dcabbbbe2b93517c9bf4f8ae1 (diff) | |
| download | xine-lib-6f3b07176ae833429586bf9d27c8477db9efa7a7.tar.gz xine-lib-6f3b07176ae833429586bf9d27c8477db9efa7a7.tar.bz2 | |
maintenance ffmpeg sync: import and activate decoders for 4X and
RealAudio codecs; import VP3 decoder but leave de-activated; fixes for
SVQ3 bugs; more conditional compilation for encoders
CVS patchset: 5067
CVS date: 2003/06/19 00:47:19
Diffstat (limited to 'src/libffmpeg/libavcodec/i386')
| -rw-r--r-- | src/libffmpeg/libavcodec/i386/dsputil_mmx.c | 3 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/i386/mpegvideo_mmx.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c index 74836387a..c22eebb07 100644 --- a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c +++ b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c @@ -1532,6 +1532,7 @@ static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *bloc void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) { mm_flags = mm_support(); +printf (" hey! mmflags = %X\n", mm_flags); if (avctx->dsp_mask) { if (avctx->dsp_mask & FF_MM_FORCE) @@ -1559,8 +1560,10 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) const int dct_algo = avctx->dct_algo; const int idct_algo= avctx->idct_algo; +#ifdef CONFIG_ENCODERS if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX) c->fdct = ff_fdct_mmx; +#endif //CONFIG_ENCODERS if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SIMPLEMMX){ c->idct_put= ff_simple_idct_put_mmx; diff --git a/src/libffmpeg/libavcodec/i386/mpegvideo_mmx.c b/src/libffmpeg/libavcodec/i386/mpegvideo_mmx.c index 8e452b499..d2f477b7b 100644 --- a/src/libffmpeg/libavcodec/i386/mpegvideo_mmx.c +++ b/src/libffmpeg/libavcodec/i386/mpegvideo_mmx.c @@ -26,7 +26,6 @@ extern uint8_t zigzag_direct_noperm[64]; extern uint16_t inv_zigzag_direct16[64]; -extern uint32_t inverse[256]; static const unsigned long long int mm_wabs __attribute__ ((aligned(8))) = 0xffffffffffffffffULL; static const unsigned long long int mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL; |