diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-17 10:16:02 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-17 10:31:15 -0800 |
| commit | a95e3fa90b4190381b65d180eec5a4027075e2da (patch) | |
| tree | 2f18a26417ab33dddfdd00c0bb10c85617fd2125 | |
| parent | 5d9ad5425f1fae4876e30c2c4500bfd0950e0d88 (diff) | |
| download | ffmpeg-a95e3fa90b4190381b65d180eec5a4027075e2da.tar.gz | |
swscale: update context offsets after removal of AlpMmxFilter.
| -rw-r--r-- | libswscale/swscale_internal.h | 9 | ||||
| -rw-r--r-- | libswscale/x86/swscale_template.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 5e93629d54..8da1201cbc 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -352,11 +352,10 @@ typedef struct SwsContext { #define U_TEMP "11*8+4*4*256*2+24" #define V_TEMP "11*8+4*4*256*2+32" #define Y_TEMP "11*8+4*4*256*2+40" -#define ALP_MMX_FILTER_OFFSET "11*8+4*4*256*2+48" -#define UV_OFF_PX "11*8+4*4*256*3+48" -#define UV_OFF_BYTE "11*8+4*4*256*3+56" -#define DITHER16 "11*8+4*4*256*3+64" -#define DITHER32 "11*8+4*4*256*3+80" +#define UV_OFF_PX "11*8+4*4*256*2+48" +#define UV_OFF_BYTE "11*8+4*4*256*2+56" +#define DITHER16 "11*8+4*4*256*2+64" +#define DITHER32 "11*8+4*4*256*2+80" DECLARE_ALIGNED(8, uint64_t, redDither); DECLARE_ALIGNED(8, uint64_t, greenDither); diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index c6f90f69f1..ae05c0b506 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -268,7 +268,7 @@ static void RENAME(yuv2rgb32_X_ar)(SwsContext *c, const int16_t *lumFilter, "movq %%mm2, "U_TEMP"(%0) \n\t" "movq %%mm4, "V_TEMP"(%0) \n\t" "movq %%mm5, "Y_TEMP"(%0) \n\t" - YSCALEYUV2PACKEDX_ACCURATE_YA(ALP_MMX_FILTER_OFFSET) + YSCALEYUV2PACKEDX_ACCURATE_YA(LUM_MMX_FILTER_OFFSET) "movq "Y_TEMP"(%0), %%mm5 \n\t" "psraw $3, %%mm1 \n\t" "psraw $3, %%mm7 \n\t" @@ -298,7 +298,7 @@ static void RENAME(yuv2rgb32_X)(SwsContext *c, const int16_t *lumFilter, if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { YSCALEYUV2PACKEDX YSCALEYUV2RGBX - YSCALEYUV2PACKEDX_YA(ALP_MMX_FILTER_OFFSET, %%mm0, %%mm3, %%mm6, %%mm1, %%mm7) + YSCALEYUV2PACKEDX_YA(LUM_MMX_FILTER_OFFSET, %%mm0, %%mm3, %%mm6, %%mm1, %%mm7) "psraw $3, %%mm1 \n\t" "psraw $3, %%mm7 \n\t" "packuswb %%mm7, %%mm1 \n\t" |