diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2007-05-08 17:55:56 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2007-05-08 17:55:56 +0000 |
| commit | bba5293bb7b1b18fed7467438c95a9f14217219a (patch) | |
| tree | 4c9ca25782f496b02b58ebb8564ec925e4c93a74 /libavcodec | |
| parent | 8d2fb33320bce7a3847d4ef16dbf293724f3bc07 (diff) | |
| download | ffmpeg-bba5293bb7b1b18fed7467438c95a9f14217219a.tar.gz | |
cosmetics: remove duplicate transpose macro
Originally committed as revision 8939 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 12 | ||||
| -rw-r--r-- | libavcodec/i386/h264dsp_mmx.c | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index c920e3f180..4da859ab2a 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -201,6 +201,12 @@ static const uint64_t ff_pb_FC attribute_used __attribute__ ((aligned(8))) = 0xF "punpckl" #n " " #b ", " #a " \n\t" /* aebf */\ "punpckh" #n " " #b ", " #t " \n\t" /* cgdh */\ +#define TRANSPOSE4(a,b,c,d,t)\ + SBUTTERFLY(a,b,t,wd) /* a=aebf t=cgdh */\ + SBUTTERFLY(c,d,b,wd) /* c=imjn b=kolp */\ + SBUTTERFLY(a,c,d,dq) /* a=aeim d=bfjn */\ + SBUTTERFLY(t,b,c,dq) /* t=cgko c=dhlp */ + /***********************************/ /* standard MMX */ @@ -1537,12 +1543,6 @@ static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *src1, uint8_t "pmaxsw " #z ", " #a " \n\t"\ "paddusw " #a ", " #sum " \n\t" -#define TRANSPOSE4(a,b,c,d,t)\ - SBUTTERFLY(a,b,t,wd) /* a=aebf t=cgdh */\ - SBUTTERFLY(c,d,b,wd) /* c=imjn b=kolp */\ - SBUTTERFLY(a,c,d,dq) /* a=aeim d=bfjn */\ - SBUTTERFLY(t,b,c,dq) /* t=cgko c=dhlp */ - #define LOAD4(o, a, b, c, d)\ "movq "#o"(%1), " #a " \n\t"\ "movq "#o"+16(%1), " #b " \n\t"\ diff --git a/libavcodec/i386/h264dsp_mmx.c b/libavcodec/i386/h264dsp_mmx.c index 2cead03615..e5cf579702 100644 --- a/libavcodec/i386/h264dsp_mmx.c +++ b/libavcodec/i386/h264dsp_mmx.c @@ -48,12 +48,6 @@ SUMSUBD2_AB( s13, d13, t )\ SUMSUB_BADC( d13, s02, s13, d02 ) -#define TRANSPOSE4(a,b,c,d,t)\ - SBUTTERFLY(a,b,t,wd) /* a=aebf t=cgdh */\ - SBUTTERFLY(c,d,b,wd) /* c=imjn b=kolp */\ - SBUTTERFLY(a,c,d,dq) /* a=aeim d=bfjn */\ - SBUTTERFLY(t,b,c,dq) /* t=cgko c=dhlp */ - #define STORE_DIFF_4P( p, t, z ) \ "psraw $6, "#p" \n\t"\ "movd (%0), "#t" \n\t"\ |