ref: 55f5d557f20d9f81dad13412314f62e17bc32f5c
parent: b09aa3ac544dad0b0eeed8c56350d2deef3b6126
author: James Zern <[email protected]>
date: Wed Sep 9 17:05:42 EDT 2015
vp10: add extern "C" to headers Change-Id: Ie2e8b37fa01ce8d6b993684f431f3159d511cfb1
--- 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;
@@ -53,5 +57,9 @@
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_
--- 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;
@@ -62,5 +66,9 @@
// Copy necessary decoding context from src worker to dst worker.
void vp10_frameworker_copy_context(VPxWorker *const dst_worker,
VPxWorker *const src_worker);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
#endif // VP10_DECODER_DTHREAD_H_
--- 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;
@@ -83,5 +87,9 @@
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_ */
--- 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;
@@ -21,5 +25,9 @@
} EncWorkerData;
void vp10_encode_tiles_mt(struct VP10_COMP *cpi);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
#endif // VP10_ENCODER_ETHREAD_H_
--- a/vp10/encoder/resize.h
+++ b/vp10/encoder/resize.h
@@ -14,6 +14,10 @@
#include <stdio.h>
#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 @@
int owidth,
int bd);
#endif // CONFIG_VP9_HIGHBITDEPTH
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif // VP10_ENCODER_RESIZE_H_