commit 5b2021ea0dc45865d5a7475e7d9552621af1bdfd
author David Michael Barr <b@rr-dav.id.au> Thu Aug 17 18:12:39 2017 +0900
committer Luc Trudeau <luc@trud.ca> Wed Sep 13 17:39:53 2017 +0000
tree 2b7415f06e9448b873114d7313da37f956e8026a
parent a5263757b60e0cb1bd5cc5bfdac52839f241bfb1

[CFL] Fix typedef-redefinition compiler warnings

Instead of forward-declaring AV1_COMMON and MACROBLOCKD,
move the dependent struct and function prototype closer
to where they are used and after these types are defined.

Change-Id: I75f005b46ef322a6fcbc01377b8dded1637c5f73

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 278a0e0..5b90d36 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -21,6 +21,9 @@
 #include "aom_ports/mem.h"
 #include "aom_ports/system_state.h"
 
+#if CONFIG_CFL
+#include "av1/common/cfl.h"
+#endif
 #include "av1/common/common.h"
 #include "av1/common/common_data.h"
 #include "av1/common/entropy.h"