diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:53:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:56:48 +0200 |
| commit | c14fc4585c2b8636ae0609582456c78097ea82c9 (patch) | |
| tree | ccfd862de19247e32e5a7b40bf9769a41c26cb84 /libswscale/swscale.c | |
| parent | 1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260 (diff) | |
| parent | aa2ba8c99e5708884a56aea9c1d96e014866f8a3 (diff) | |
Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'
* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
swscale: Move extern declarations for tables to swscale_internal.h
Conflicts:
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index db416022bf..1ca6934981 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -35,7 +35,7 @@ #include "swscale_internal.h" #include "swscale.h" -DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128)[8][8] = { +DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_128)[][8] = { { 36, 68, 60, 92, 34, 66, 58, 90, }, { 100, 4, 124, 28, 98, 2, 122, 26, }, { 52, 84, 44, 76, 50, 82, 42, 74, }, @@ -557,8 +557,8 @@ static int swScale(SwsContext *c, const uint8_t *src[], lastInLumBuf, lastInChrBuf); #endif if (should_dither) { - c->chrDither8 = dither_8x8_128[chrDstY & 7]; - c->lumDither8 = dither_8x8_128[dstY & 7]; + c->chrDither8 = ff_dither_8x8_128[chrDstY & 7]; + c->lumDither8 = ff_dither_8x8_128[dstY & 7]; } if (dstY >= dstH - 2) { /* hmm looks like we can't use MMX here without overwriting |