commit 17ce8b170f26e45aba3be193f920334aec28ce9d
author Tom Finegan <tomfinegan@google.com> Wed Feb 08 12:46:31 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Mon Feb 13 18:07:27 2017 +0000
tree b723127feb54382256ff425ee9966b485d0c2032
parent 71a2ea7737b46fac0c2823d21d70e9424aa834e1

Remove file base name collisions.

Change-Id: I1bf9002c159563d0e5238b26d1515ef305d416dc

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index df26b60..e87e535 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -38,6 +38,7 @@
 #endif  // CONFIG_WARPED_MOTION
 
 #include "av1/encoder/aq_variance.h"
+#include "av1/encoder/av1_quantize.h"
 #include "av1/encoder/cost.h"
 #include "av1/encoder/encodemb.h"
 #include "av1/encoder/encodemv.h"
@@ -47,7 +48,6 @@
 #if CONFIG_PALETTE
 #include "av1/encoder/palette.h"
 #endif  // CONFIG_PALETTE
-#include "av1/encoder/quantize.h"
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/rd.h"
 #include "av1/encoder/rdopt.h"