From: hkuang <hkuang@google.com>
Date: Wed, 9 Jul 2014 17:16:13 +0000 (-0700)
Subject: Merge "Move vp9_thread.* to common."
X-Git-Tag: v1.4.0~1251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b84ee5a3d07a569968dc4fdf9c9d8d3bea155bd7;p=libvpx

Merge "Move vp9_thread.* to common."
---

b84ee5a3d07a569968dc4fdf9c9d8d3bea155bd7
diff --cc vp9/decoder/vp9_decoder.h
index 2a618f955,2c33316aa..8e16e1cac
--- a/vp9/decoder/vp9_decoder.h
+++ b/vp9/decoder/vp9_decoder.h
@@@ -18,9 -18,10 +18,9 @@@
  
  #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" {