shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove vp9_blockd.h from vp9_common_data.c"

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -49,8 +49,6 @@

 typedef char ENTROPY_CONTEXT;

-typedef char PARTITION_CONTEXT;

-

 static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a,

                                            ENTROPY_CONTEXT b) {

   return (a != 0) + (b != 0);

--- a/vp9/common/vp9_common_data.c

+++ b/vp9/common/vp9_common_data.c

@@ -8,8 +8,6 @@

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

  */

-

-#include "vp9/common/vp9_blockd.h"

 #include "vp9/common/vp9_common_data.h"

 // Log 2 conversion lookup tables for block width and height

--- a/vp9/common/vp9_enums.h

+++ b/vp9/common/vp9_enums.h

@@ -67,6 +67,7 @@

   PARTITION_INVALID = PARTITION_TYPES

 } PARTITION_TYPE;

+typedef char PARTITION_CONTEXT;

 #define PARTITION_PLOFFSET   4  // number of probability models per block size

 #define PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET)