Commit 1ef0b8f9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd2585315'

* commit 'd2585315':
  swscale: Mark a bunch of tables only used within one file static

Conflicts:
	libswscale/swscale_unscaled.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7372177a d2585315
...@@ -46,7 +46,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128)[8][8] = { ...@@ -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[], ...@@ -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;
......
...@@ -814,7 +814,6 @@ static av_always_inline int usePal(enum AVPixelFormat pix_fmt) ...@@ -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;
......
...@@ -34,7 +34,7 @@ ...@@ -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,},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment