summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_firstpass.c
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2013-11-18 15:43:32 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-11-18 15:43:32 -0800
commita42ab027fd784150e11497fc0f00ec894cbfd1c7 (patch)
tree178c5498a0d619a5b6144e0f5bdb7d08eb27333f /vp9/encoder/vp9_firstpass.c
parent46ce6ddec408c41a68a81b3af563d073c45e3cc3 (diff)
parent1c61e1960dbd554c6e2bcd2ee39ff54575ba3efd (diff)
downloadlibvpx-a42ab027fd784150e11497fc0f00ec894cbfd1c7.tar
libvpx-a42ab027fd784150e11497fc0f00ec894cbfd1c7.tar.gz
libvpx-a42ab027fd784150e11497fc0f00ec894cbfd1c7.tar.bz2
libvpx-a42ab027fd784150e11497fc0f00ec894cbfd1c7.zip
Merge "Move vp9_extend.{h,c} from common to encoder"
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
-rw-r--r--vp9/encoder/vp9_firstpass.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 70d711cee..d80ecb152 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -11,16 +11,16 @@
#include <math.h>
#include <limits.h>
#include <stdio.h>
+#include "vp9/common/vp9_systemdependent.h"
#include "vp9/encoder/vp9_block.h"
+#include "vp9/encoder/vp9_encodeframe.h"
+#include "vp9/encoder/vp9_encodemb.h"
+#include "vp9/encoder/vp9_extend.h"
+#include "vp9/encoder/vp9_firstpass.h"
+#include "vp9/encoder/vp9_mcomp.h"
#include "vp9/encoder/vp9_onyx_int.h"
#include "vp9/encoder/vp9_variance.h"
-#include "vp9/encoder/vp9_mcomp.h"
-#include "vp9/encoder/vp9_firstpass.h"
#include "vpx_scale/vpx_scale.h"
-#include "vp9/encoder/vp9_encodeframe.h"
-#include "vp9/encoder/vp9_encodemb.h"
-#include "vp9/common/vp9_extend.h"
-#include "vp9/common/vp9_systemdependent.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12config.h"
#include "vp9/encoder/vp9_quantize.h"