Sort header files

cherry-picked #ecd07473 from aom/master

Change-Id: Id8f45d9c11406fc301b39801c5228ccd6aa2d5d6

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index bff026750a23fb7d2bcf7b17030a85557185ec9b..de0b502eaf408834ae86d8a4dac2cdd945cc2002 100644 (file)
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -12,14 +12,14 @@
 #include <assert.h>
 #include <stdlib.h>  // qsort()
 
-#include "./av1_rtcd.h"
 #include "./aom_config.h"
 #include "./aom_dsp_rtcd.h"
 #include "./aom_scale_rtcd.h"
+#include "./av1_rtcd.h"
 
-#include "aom_dsp/bitreader_buffer.h"
-#include "av1/decoder/bitreader.h"
 #include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/bitreader.h"
+#include "aom_dsp/bitreader_buffer.h"
 #include "aom_mem/aom_mem.h"
 #include "aom_ports/mem.h"
 #include "aom_ports/mem_ops.h"
@@ -37,18 +37,18 @@
 #include "av1/common/entropy.h"
 #include "av1/common/entropymode.h"
 #include "av1/common/idct.h"
-#include "av1/common/thread_common.h"
 #include "av1/common/pred_common.h"
 #include "av1/common/quant_common.h"
-#include "av1/common/reconintra.h"
 #include "av1/common/reconinter.h"
+#include "av1/common/reconintra.h"
 #include "av1/common/seg_common.h"
+#include "av1/common/thread_common.h"
 #include "av1/common/tile_common.h"
 
 #include "av1/decoder/decodeframe.h"
-#include "av1/decoder/detokenize.h"
 #include "av1/decoder/decodemv.h"
 #include "av1/decoder/decoder.h"
+#include "av1/decoder/detokenize.h"
 #include "av1/decoder/dsubexp.h"
 
 #define MAX_AV1_HEADER_SIZE 80

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 290f6c1995422089ebfa574279e0fb213ec41021..2f11daee2cdf3769e62b592544877cd31f2d5d7f 100644 (file)
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -20,8 +20,8 @@
 #include "av1/common/reconinter.h"
 #include "av1/common/seg_common.h"
 
-#include "av1/decoder/decodemv.h"
 #include "av1/decoder/decodeframe.h"
+#include "av1/decoder/decodemv.h"
 
 #include "aom_dsp/aom_dsp_common.h"
 

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 3e9e2c2db701c5c2e42610f3d7652458dc99edab..b6facfafcda7e76a56fe86330c1f91bd01f706c4 100644 (file)
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -61,9 +61,9 @@
 #endif
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_dsp/aom_filter.h"
+#include "aom_ports/aom_timer.h"
 #include "aom_ports/mem.h"
 #include "aom_ports/system_state.h"
-#include "aom_ports/aom_timer.h"
 #include "aom_scale/aom_scale.h"
 #include "aom_util/debug_util.h"
 

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index fbcc914aee8fb29ca4239249a2108339637002a6..8874076d3d48fab10180d385294b773aee4a1f8b 100644 (file)
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -12,8 +12,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "./av1_rtcd.h"
 #include "./aom_dsp_rtcd.h"
+#include "./av1_rtcd.h"
 
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_dsp/blend.h"
@@ -34,6 +34,7 @@
 #include "av1/common/scan.h"
 #include "av1/common/seg_common.h"
 
+#include "av1/encoder/aq_variance.h"
 #include "av1/encoder/cost.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/encodemv.h"
@@ -45,7 +46,6 @@
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/rdopt.h"
-#include "av1/encoder/aq_variance.h"
 
 #if CONFIG_DUAL_FILTER
 #if CONFIG_EXT_INTERP