diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-19 06:38:49 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-19 13:31:12 -0800 |
| commit | b18f8cbf3dd27ba881770ef588fcb4d1de4a41f5 (patch) | |
| tree | b564bef7dc4e9450df036a86df54b45892ebc757 /libswscale/swscale_internal.h | |
| parent | 2b3d041cdc88fe556e61f70130a3a7eb024e0958 (diff) | |
| download | ffmpeg-b18f8cbf3dd27ba881770ef588fcb4d1de4a41f5.tar.gz | |
Revert two swscale commits.
Revert "swscale: update context offsets after removal of AlpMmxFilter."
(commit a95e3fa90b4190381b65d180eec5a4027075e2da)
and
Revert "swscale: Remove some write-only variables related to alpha handling."
(commit 9d03cb9fc5ddf914920ab0dbe13f19a34c754966).
They broke alpha handling - it's the evil inline asm that still uses that
variable, so it's not truely write-only.
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 8da1201cbc..bc36826ea2 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -352,10 +352,11 @@ 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 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" +#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" DECLARE_ALIGNED(8, uint64_t, redDither); DECLARE_ALIGNED(8, uint64_t, greenDither); @@ -377,6 +378,7 @@ typedef struct SwsContext { DECLARE_ALIGNED(8, uint64_t, u_temp); DECLARE_ALIGNED(8, uint64_t, v_temp); DECLARE_ALIGNED(8, uint64_t, y_temp); + int32_t alpMmxFilter[4 * MAX_FILTER_SIZE]; // alignment of these values is not necessary, but merely here // to maintain the same offset across x8632 and x86-64. Once we // use proper offset macros in the asm, they can be removed. |