From 55f5d557f20d9f81dad13412314f62e17bc32f5c Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 9 Sep 2015 21:05:42 -0700 Subject: [PATCH] vp10: add extern "C" to headers Change-Id: Ie2e8b37fa01ce8d6b993684f431f3159d511cfb1 --- vp10/common/thread_common.h | 8 ++++++++ vp10/decoder/dthread.h | 8 ++++++++ vp10/encoder/context_tree.h | 8 ++++++++ vp10/encoder/ethread.h | 8 ++++++++ vp10/encoder/resize.h | 9 +++++++++ 5 files changed, 41 insertions(+) diff --git a/vp10/common/thread_common.h b/vp10/common/thread_common.h index 6388c7a28..a401ddcb2 100644 --- a/vp10/common/thread_common.h +++ b/vp10/common/thread_common.h @@ -14,6 +14,10 @@ #include "vp10/common/loopfilter.h" #include "vpx_util/vpx_thread.h" +#ifdef __cplusplus +extern "C" { +#endif + struct VP10Common; struct FRAME_COUNTS; @@ -54,4 +58,8 @@ void vp10_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, void vp10_accumulate_frame_counts(struct VP10Common *cm, struct FRAME_COUNTS *counts, int is_dec); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP10_COMMON_LOOPFILTER_THREAD_H_ diff --git a/vp10/decoder/dthread.h b/vp10/decoder/dthread.h index 7332aada2..1b0dc0191 100644 --- a/vp10/decoder/dthread.h +++ b/vp10/decoder/dthread.h @@ -15,6 +15,10 @@ #include "vpx_util/vpx_thread.h" #include "vpx/internal/vpx_codec_internal.h" +#ifdef __cplusplus +extern "C" { +#endif + struct VP10Common; struct VP10Decoder; @@ -63,4 +67,8 @@ void vp10_frameworker_broadcast(RefCntBuffer *const buf, int row); void vp10_frameworker_copy_context(VPxWorker *const dst_worker, VPxWorker *const src_worker); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP10_DECODER_DTHREAD_H_ diff --git a/vp10/encoder/context_tree.h b/vp10/encoder/context_tree.h index 9310d1fc3..67a07cb50 100644 --- a/vp10/encoder/context_tree.h +++ b/vp10/encoder/context_tree.h @@ -14,6 +14,10 @@ #include "vp10/common/blockd.h" #include "vp10/encoder/block.h" +#ifdef __cplusplus +extern "C" { +#endif + struct VP10_COMP; struct VP10Common; struct ThreadData; @@ -84,4 +88,8 @@ typedef struct PC_TREE { void vp10_setup_pc_tree(struct VP10Common *cm, struct ThreadData *td); void vp10_free_pc_tree(struct ThreadData *td); +#ifdef __cplusplus +} // extern "C" +#endif + #endif /* VP10_ENCODER_CONTEXT_TREE_H_ */ diff --git a/vp10/encoder/ethread.h b/vp10/encoder/ethread.h index 997df0d04..d72816cd5 100644 --- a/vp10/encoder/ethread.h +++ b/vp10/encoder/ethread.h @@ -11,6 +11,10 @@ #ifndef VP10_ENCODER_ETHREAD_H_ #define VP10_ENCODER_ETHREAD_H_ +#ifdef __cplusplus +extern "C" { +#endif + struct VP10_COMP; struct ThreadData; @@ -22,4 +26,8 @@ typedef struct EncWorkerData { void vp10_encode_tiles_mt(struct VP10_COMP *cpi); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP10_ENCODER_ETHREAD_H_ diff --git a/vp10/encoder/resize.h b/vp10/encoder/resize.h index 131fc80ca..bf6377097 100644 --- a/vp10/encoder/resize.h +++ b/vp10/encoder/resize.h @@ -14,6 +14,10 @@ #include #include "vpx/vpx_integer.h" +#ifdef __cplusplus +extern "C" { +#endif + void vp10_resize_plane(const uint8_t *const input, int height, int width, @@ -121,4 +125,9 @@ void vp10_highbd_resize_frame444(const uint8_t *const y, int owidth, int bd); #endif // CONFIG_VP9_HIGHBITDEPTH + +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP10_ENCODER_RESIZE_H_ -- 2.40.0