From 6109b56de74cfcda6321fcd5e37cac988734119c Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Fri, 6 Dec 2002 01:55:32 +0000 Subject: - sync with ffmpeg (that must fix heiko stream, thanks Michael Niedermayer) - improve ffmpeg support (passing extra data) - aspect ratio still need to be updated to new syntax - use our svq1 decoder since ffmpeg one is segfaulting (buffer overrun - more investigation needed) - img->copy no more CVS patchset: 3437 CVS date: 2002/12/06 01:55:32 --- src/libffmpeg/libavcodec/i386/motion_est_mmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libffmpeg/libavcodec/i386') diff --git a/src/libffmpeg/libavcodec/i386/motion_est_mmx.c b/src/libffmpeg/libavcodec/i386/motion_est_mmx.c index 9b76cdb07..3368e7333 100644 --- a/src/libffmpeg/libavcodec/i386/motion_est_mmx.c +++ b/src/libffmpeg/libavcodec/i386/motion_est_mmx.c @@ -263,6 +263,7 @@ static inline int sum_mmx2() return ret; } + #define PIX_SAD(suf)\ int pix_abs8x8_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\ {\ @@ -282,7 +283,7 @@ int pix_abs8x8_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\ :: "m"(round_tab[1]) \ );\ \ - sad8_2_ ## suf(blk1, blk2+1, blk2, stride, 3);\ + sad8_2_ ## suf(blk1, blk1+1, blk2, stride, 3);\ \ return sum_ ## suf();\ }\ -- cgit v1.2.3