diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-09-30 10:41:23 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-30 10:41:23 -0700 |
| commit | bc1b0893728627fd90fee77e428f142917369532 (patch) | |
| tree | 5b9361dab887119731cce9c9deed6a0e1610f7fc | |
| parent | 0f8805e0865263763cafb9ecfe189e7e681e5d3d (diff) | |
| parent | 11cf0c39c9fc4d6fb39b8c10ffa144b375bb95d9 (diff) | |
| download | libvpx-bc1b0893728627fd90fee77e428f142917369532.tar libvpx-bc1b0893728627fd90fee77e428f142917369532.tar.gz libvpx-bc1b0893728627fd90fee77e428f142917369532.tar.bz2 libvpx-bc1b0893728627fd90fee77e428f142917369532.zip | |
Merge changes Id58e2176,I7efc74ef
* changes:
cpplint issues in vp9_filter.h
cpplint issues with onyxc_int.h
| -rw-r--r-- | vp9/common/vp9_filter.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h index 7b1ffaeda..58260ce99 100644 --- 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 diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 44948ff4d..f7d639103 100644 --- 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 @@ typedef struct VP9Common { 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; |