shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix linker warnings for bilinear filters"

--- a/vp8/common/filter.c

+++ b/vp8/common/filter.c

@@ -9,9 +9,7 @@

  */

-#include <stdlib.h>

 #include "filter.h"

-#include "vpx_ports/mem.h"

 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]) =

 {

--- a/vp8/common/filter.h

+++ b/vp8/common/filter.h

@@ -12,11 +12,13 @@

 #ifndef FILTER_H

 #define FILTER_H

+#include "vpx_ports/mem.h"

+

 #define BLOCK_HEIGHT_WIDTH 4

 #define VP8_FILTER_WEIGHT 128

 #define VP8_FILTER_SHIFT  7

-extern const short vp8_bilinear_filters[8][2];

-extern const short vp8_sub_pel_filters[8][6];

+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]);

+extern DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters[8][6]);

 #endif

--- a/vp8/common/x86/filter_x86.c

+++ b/vp8/common/x86/filter_x86.c

@@ -8,7 +8,7 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#include "vpx_ports/mem.h"

+#include "vp8/common/x86/filter_x86.h"

 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]) =

 {

--- a/vp8/common/x86/filter_x86.h

+++ b/vp8/common/x86/filter_x86.h

@@ -11,9 +11,15 @@

 #ifndef FILTER_X86_H

 #define FILTER_X86_H

+#include "vpx_ports/mem.h"

+

 /* x86 assembly specific copy of vp8/common/filter.c:vp8_bilinear_filters with

  * duplicated values */

-extern const short vp8_bilinear_filters_x86_4[8][8];  /* duplicated 4x */

-extern const short vp8_bilinear_filters_x86_8[8][16]; /* duplicated 8x */

+

+/* duplicated 4x */

+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]);

+

+/* duplicated 8x */

+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]);

 #endif /* FILTER_X86_H */