diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:38:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:40:32 +0200 |
commit | 1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260 (patch) | |
tree | 23ab8275f66acfa5da4abc88e03737e9159b3f15 /libswscale/swscale.c | |
parent | 7372177a08c0fda59bc01abe44199b68953c3c70 (diff) | |
parent | d258531502b24cb653204fe4f003c8815755bdc4 (diff) | |
download | ffmpeg-streaming-1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260.zip ffmpeg-streaming-1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260.tar.gz |
Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
swscale: Mark a bunch of tables only used within one file static
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 87b867d..db41602 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -46,7 +46,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128)[8][8] = { { 112, 16, 104, 8, 118, 22, 110, 14, }, }; -DECLARE_ALIGNED(8, const uint8_t, ff_sws_pb_64)[8] = { +DECLARE_ALIGNED(8, static const uint8_t, sws_pb_64)[8] = { 64, 64, 64, 64, 64, 64, 64, 64 }; @@ -448,7 +448,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], } if (!should_dither) { - c->chrDither8 = c->lumDither8 = ff_sws_pb_64; + c->chrDither8 = c->lumDither8 = sws_pb_64; } lastDstY = dstY; |