vp8/decoder: add extern "C" to headers Change-Id: I7865db2d15ffa8cfa4de88714e48734c5ff9bb86
diff --git a/vp8/decoder/dboolhuff.h b/vp8/decoder/dboolhuff.h index 82de6b8..36af7ee 100644 --- 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 @@ 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 b5d750c..f33b073 100644 --- 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 3a8277f..c563cf6 100644 --- 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_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 f134df8..f0b1254 100644 --- 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 0a3123a..3af5ca8 100644 --- 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 @@ 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 10bf870..9a1e024 100644 --- 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_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 3728152..8ef4894 100644 --- 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 @@ } 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 1d3f672..35ee696 100644 --- 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 @@ return -i; } +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_DECODER_TREEREADER_H_