shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes Id58e2176,I7efc74ef

* changes:
  cpplint issues in vp9_filter.h
  cpplint issues with onyxc_int.h

--- a/vp9/common/vp9_filter.h

+++ b/vp9/common/vp9_filter.h

@@ -11,7 +11,7 @@

 #ifndef VP9_COMMON_VP9_FILTER_H_

 #define VP9_COMMON_VP9_FILTER_H_

-#include "vpx_config.h"

+#include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

 #define SUBPEL_BITS 4

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

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

 #ifndef VP9_COMMON_VP9_ONYXC_INT_H_

 #define VP9_COMMON_VP9_ONYXC_INT_H_

-#include "vpx_config.h"

+#include "./vpx_config.h"

 #include "vpx/internal/vpx_codec_internal.h"

-#include "vp9_rtcd.h"

+#include "./vp9_rtcd.h"

 #include "vp9/common/vp9_loopfilter.h"

 #include "vp9/common/vp9_entropymv.h"

 #include "vp9/common/vp9_entropy.h"

@@ -120,7 +120,7 @@

   YV12_BUFFER_CONFIG post_proc_buffer;

-  FRAME_TYPE last_frame_type;  /* Save last frame's frame type for motion search. */

+  FRAME_TYPE last_frame_type;  /* last frame's frame type for motion search.*/

   FRAME_TYPE frame_type;

   int show_frame;