vp8/decoder: add extern "C" to headers

Change-Id: I7865db2d15ffa8cfa4de88714e48734c5ff9bb86

diff --git a/vp8/decoder/dboolhuff.h b/vp8/decoder/dboolhuff.h
index 82de6b8c8ab044598a61c3f66bd815a830ddf487..36af7eed5926a82c4f4776b35db2423b379395df 100644 (file)
--- a/vp8/decoder/dboolhuff.h
+++ b/vp8/decoder/dboolhuff.h
@@ -19,6 +19,10 @@
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_integer.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef size_t VP8_BD_VALUE;
 
 #define VP8_BD_VALUE_SIZE ((int)sizeof(VP8_BD_VALUE)*CHAR_BIT)
@@ -135,4 +139,8 @@ static int vp8dx_bool_error(BOOL_DECODER *br)
     return 0;
 }
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_DBOOLHUFF_H_

diff --git a/vp8/decoder/decodemv.h b/vp8/decoder/decodemv.h
index b5d750ce4eb8222dd1f16f6267bc97832f3e1b92..f33b07351d3c1cc3a0f033097b9146a5c0856480 100644 (file)
--- a/vp8/decoder/decodemv.h
+++ b/vp8/decoder/decodemv.h
@@ -13,6 +13,14 @@
 
 #include "onyxd_int.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void vp8_decode_mode_mvs(VP8D_COMP *);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_DECODEMV_H_

diff --git a/vp8/decoder/decoderthreading.h b/vp8/decoder/decoderthreading.h
index 3a8277f4e625d3e0eec9e30f9fbdb31955b2556a..c563cf6e93aa3d739fd2c049ccfc38a11b60adbc 100644 (file)
--- a/vp8/decoder/decoderthreading.h
+++ b/vp8/decoder/decoderthreading.h
@@ -11,6 +11,10 @@
 #ifndef VP8_DECODER_DECODERTHREADING_H_
 #define VP8_DECODER_DECODERTHREADING_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if CONFIG_MULTITHREAD
 void vp8mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd);
 void vp8_decoder_remove_threads(VP8D_COMP *pbi);
@@ -19,4 +23,8 @@ void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows);
 void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows);
 #endif
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_DECODERTHREADING_H_

diff --git a/vp8/decoder/detokenize.h b/vp8/decoder/detokenize.h
index f134df86907d5ed7e65cceaaac9276e237183799..f0b125444f033c7b06941765b6c2beb9faa5f496 100644 (file)
--- a/vp8/decoder/detokenize.h
+++ b/vp8/decoder/detokenize.h
@@ -13,7 +13,15 @@
 
 #include "onyxd_int.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void vp8_reset_mb_tokens_context(MACROBLOCKD *x);
 int vp8_decode_mb_tokens(VP8D_COMP *, MACROBLOCKD *);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_DETOKENIZE_H_

diff --git a/vp8/decoder/ec_types.h b/vp8/decoder/ec_types.h
index 0a3123a65cd629e437ef507fa9fbdeca7a24271b..3af5ca86b4b99e32a68d2a5a0cb6cecddcd4eb2d 100644 (file)
--- a/vp8/decoder/ec_types.h
+++ b/vp8/decoder/ec_types.h
@@ -11,6 +11,10 @@
 #ifndef VP8_DECODER_EC_TYPES_H_
 #define VP8_DECODER_EC_TYPES_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_OVERLAPS 16
 
 
@@ -47,4 +51,8 @@ typedef struct
     MV_REFERENCE_FRAME ref_frame;
 } EC_BLOCK;
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_EC_TYPES_H_

diff --git a/vp8/decoder/error_concealment.h b/vp8/decoder/error_concealment.h
index 10bf870b703c56fde48eb43a1a1b180dcf753f09..9a1e024865d99c69aa4c04eb05d6a96f2fab6187 100644 (file)
--- a/vp8/decoder/error_concealment.h
+++ b/vp8/decoder/error_concealment.h
@@ -15,6 +15,10 @@
 #include "onyxd_int.h"
 #include "ec_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Allocate memory for the overlap lists */
 int vp8_alloc_overlap_lists(VP8D_COMP *pbi);
 
@@ -38,4 +42,8 @@ void vp8_interpolate_motion(MACROBLOCKD *mb,
  */
 void vp8_conceal_corrupt_mb(MACROBLOCKD *xd);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_ERROR_CONCEALMENT_H_

diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h
index 3728152b0cd429813bfe7a0d104f261471c638f9..8ef489403c1c1f74222f38cd8ec040222bb90c75 100644 (file)
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -22,6 +22,10 @@
 #include "ec_types.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct
 {
     int ithread;
@@ -148,4 +152,8 @@ int vp8_remove_decoder_instances(struct frame_buffers *fb);
     } while(0)
 #endif
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_ONYXD_INT_H_

diff --git a/vp8/decoder/treereader.h b/vp8/decoder/treereader.h
index 1d3f6720771fb3894dd7e072b2e638ad6ee4c822..35ee696000d93440af8f519f19f8f58d455dd323 100644 (file)
--- a/vp8/decoder/treereader.h
+++ b/vp8/decoder/treereader.h
@@ -15,6 +15,10 @@
 #include "vp8/common/treecoder.h"
 #include "dboolhuff.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef BOOL_DECODER vp8_reader;
 
 #define vp8_read vp8dx_decode_bool
@@ -37,4 +41,8 @@ static int vp8_treed_read(
     return -i;
 }
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_DECODER_TREEREADER_H_