]> granicus.if.org Git - libvpx/commitdiff
Merge "Move vp9_thread.* to common."
authorhkuang <hkuang@google.com>
Wed, 9 Jul 2014 17:16:13 +0000 (10:16 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 9 Jul 2014 17:16:13 +0000 (10:16 -0700)
1  2 
vp9/decoder/vp9_decodeframe.c
vp9/decoder/vp9_decoder.h

Simple merge
index 2a618f955c0aeec091802233a794ea8d7616eac8,2c33316aa948d40b2dfbf2a51924032e048367dd..8e16e1cacb16521cd95d92702230bf7ad35ea097
  
  #include "vp9/common/vp9_onyxc_int.h"
  #include "vp9/common/vp9_ppflags.h"
+ #include "vp9/common/vp9_thread.h"
  
 -#include "vp9/decoder/vp9_decoder.h"
  #include "vp9/decoder/vp9_dthread.h"
- #include "vp9/decoder/vp9_thread.h"
  
  #ifdef __cplusplus
  extern "C" {