diff options
author | Jingning Han <jingning@google.com> | 2015-07-06 17:01:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-06 17:01:30 +0000 |
commit | 39f03bf9c672b8e7c4b483d4e919a695707c90dd (patch) | |
tree | 852bcb5a6c982338ad5c5e3bd75a87a00b395f4f /vp9/common | |
parent | 823a126d4c6e0bf784587fda5039c8e90102ceac (diff) | |
parent | d1b30ceaa35fd50e515d7a8e8354cdb08b369058 (diff) | |
download | libvpx-39f03bf9c672b8e7c4b483d4e919a695707c90dd.tar libvpx-39f03bf9c672b8e7c4b483d4e919a695707c90dd.tar.gz libvpx-39f03bf9c672b8e7c4b483d4e919a695707c90dd.tar.bz2 libvpx-39f03bf9c672b8e7c4b483d4e919a695707c90dd.zip |
Merge "Rename vpx_thread to vpx_util"
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_onyxc_int.h | 2 | ||||
-rw-r--r-- | vp9/common/vp9_thread_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index bacbd8a22..bab88bcdb 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -13,7 +13,7 @@ #include "./vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" -#include "vpx_thread/vpx_thread.h" +#include "vpx_util/vpx_thread.h" #include "./vp9_rtcd.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_loopfilter.h" diff --git a/vp9/common/vp9_thread_common.h b/vp9/common/vp9_thread_common.h index 94e6dfe7f..07af1bc4c 100644 --- a/vp9/common/vp9_thread_common.h +++ b/vp9/common/vp9_thread_common.h @@ -12,7 +12,7 @@ #define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_ #include "./vpx_config.h" #include "vp9/common/vp9_loopfilter.h" -#include "vpx_thread/vpx_thread.h" +#include "vpx_util/vpx_thread.h" struct VP9Common; struct FRAME_COUNTS; |