har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-08-16 12:38:12 +02:00
commit 1ef0b8f9cc
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/swscale.c
View File

@ -46,7 +46,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128)[8][8] = {
{ 112, 16, 104, 8, 118, 22, 110, 14, }, { 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 64, 64, 64, 64, 64, 64, 64, 64
}; };
@ -448,7 +448,7 @@ static int swScale(SwsContext *c, const uint8_t *src[],
} }
if (!should_dither) { if (!should_dither) {
c->chrDither8 = c->lumDither8 = ff_sws_pb_64; c->chrDither8 = c->lumDither8 = sws_pb_64;
} }
lastDstY = dstY; lastDstY = dstY;

1
libswscale/swscale_internal.h
View File

@ -814,7 +814,6 @@ static av_always_inline int usePal(enum AVPixelFormat pix_fmt)
extern const uint64_t ff_dither4[2]; extern const uint64_t ff_dither4[2];
extern const uint64_t ff_dither8[2]; extern const uint64_t ff_dither8[2];
extern const uint8_t dithers[8][8][8];
extern const AVClass sws_context_class; extern const AVClass sws_context_class;

2
libswscale/swscale_unscaled.c
View File

@ -34,7 +34,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
DECLARE_ALIGNED(8, const uint8_t, dithers)[8][8][8]={ DECLARE_ALIGNED(8, static const uint8_t, dithers)[8][8][8]={
{ {
{ 0, 1, 0, 1, 0, 1, 0, 1,}, { 0, 1, 0, 1, 0, 1, 0, 1,},
{ 1, 0, 1, 0, 1, 0, 1, 0,}, { 1, 0, 1, 0, 1, 0, 1, 0,},