summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-11-01 18:12:53 +0000
commitad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch)
tree24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/i386/dsputil_mmx.c
parent72ae3e51758986775949a7ba2002a526d359389f (diff)
downloadxine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz
xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2
big ffmpeg patch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER, which will only compile an I-frame-only MPEG1 encoder (speeds up compile time) * fix a lot of warnings in ffmpeg (a good deal of which have already been submitted to the ffmpeg project by Mike) * simplify some Makefiles CVS patchset: 5667 CVS date: 2003/11/01 18:12:53
Diffstat (limited to 'src/libffmpeg/libavcodec/i386/dsputil_mmx.c')
-rw-r--r--src/libffmpeg/libavcodec/i386/dsputil_mmx.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
index c523be74a..a1e1642d5 100644
--- a/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
+++ b/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
@@ -588,6 +588,7 @@ static void diff_bytes_mmx(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w){
for(; i<w; i++)
dst[i+0] = src1[i+0]-src2[i+0];
}
+#endif
static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top){
int i=0;
@@ -625,6 +626,8 @@ static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *src1, uint8_t
*left = src2[w-1];
}
+#ifdef CONFIG_ENCODERS
+
#define LBUTTERFLY2(a1,b1,a2,b2)\
"paddw " #b1 ", " #a1 " \n\t"\
"paddw " #b2 ", " #a2 " \n\t"\
@@ -1599,10 +1602,10 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
#endif
if (mm_flags & MM_MMX) {
- const int dct_algo = avctx->dct_algo;
const int idct_algo= avctx->idct_algo;
-
#ifdef CONFIG_ENCODERS
+ const int dct_algo = avctx->dct_algo;
+
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX)
c->fdct = ff_fdct_mmx;
#endif //CONFIG_ENCODERS