From 84f982080a352484217087c071b32055d0f7f08f Mon Sep 17 00:00:00 2001
From: Yunqing Wang <yunqingwang@google.com>
Date: Tue, 1 Mar 2016 13:16:03 -0800
Subject: [PATCH] Minor fix in header files

Move functions to be included in extern "C".

Change-Id: If57fa5eb7955763cf99e6839dde4d7221fad75ea
---
 vp10/encoder/encoder.h | 8 ++++----
 vp10/encoder/rdopt.h   | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/vp10/encoder/encoder.h b/vp10/encoder/encoder.h
index 2c158a47c..efde0fc31 100644
--- a/vp10/encoder/encoder.h
+++ b/vp10/encoder/encoder.h
@@ -701,10 +701,6 @@ void vp10_new_framerate(VP10_COMP *cpi, double framerate);
 
 #define LAYER_IDS_TO_IDX(sl, tl, num_tl) ((sl) * (num_tl) + (tl))
 
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
 #if CONFIG_AFFINE_MOTION
 // Update up-sampled reference frame index.
 static INLINE void uref_cnt_fb(EncRefCntBuffer *ubufs, int *uidx,
@@ -719,4 +715,8 @@ static INLINE void uref_cnt_fb(EncRefCntBuffer *ubufs, int *uidx,
 }
 #endif
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP10_ENCODER_ENCODER_H_
diff --git a/vp10/encoder/rdopt.h b/vp10/encoder/rdopt.h
index 74702a95b..f4d9b9553 100644
--- a/vp10/encoder/rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -102,9 +102,6 @@ void vp10_build_prediction_by_left_preds(VP10_COMP *cpi,
                                          uint8_t *tmp_buf[MAX_MB_PLANE],
                                          int tmp_stride[MAX_MB_PLANE]);
 #endif  // CONFIG_OBMC
-#ifdef __cplusplus
-}  // extern "C"
-#endif
 
 #if CONFIG_AFFINE_MOTION
 static INLINE const YV12_BUFFER_CONFIG *get_upsampled_ref(VP10_COMP *cpi,
@@ -122,4 +119,8 @@ static INLINE const YV12_BUFFER_CONFIG *get_upsampled_ref(VP10_COMP *cpi,
 }
 #endif
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP10_ENCODER_RDOPT_H_
-- 
2.40.0