Commit bc1b0893 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge changes Id58e2176,I7efc74ef

* changes:
  cpplint issues in vp9_filter.h
  cpplint issues with onyxc_int.h
parents 0f8805e0 11cf0c39
......@@ -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
......
......@@ -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;
......
Supports Markdown
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