Commit ec7f2133 authored by James Zern's avatar James Zern
Browse files

vpx: add extern "C" to headers

Change-Id: Ide9a68466ed30453872465a6c2f9c414690df876
parent b453941c
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
#include "../vpx_encoder.h" #include "../vpx_encoder.h"
#include <stdarg.h> #include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif
/*!\brief Current ABI version number /*!\brief Current ABI version number
* *
...@@ -476,6 +479,7 @@ vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list, ...@@ -476,6 +479,7 @@ vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list,
#include <stdio.h> #include <stdio.h>
#include <setjmp.h> #include <setjmp.h>
struct vpx_internal_error_info { struct vpx_internal_error_info {
vpx_codec_err_t error_code; vpx_codec_err_t error_code;
int has_detail; int has_detail;
...@@ -532,4 +536,8 @@ vpx_codec_err_t vpx_validate_mmaps(const vpx_codec_stream_info_t *si, ...@@ -532,4 +536,8 @@ vpx_codec_err_t vpx_validate_mmaps(const vpx_codec_stream_info_t *si,
const vpx_codec_mmap_t *mmaps, const vpx_codec_mmap_t *mmaps,
const mem_req_t *mem_reqs, int nreqs, const mem_req_t *mem_reqs, int nreqs,
vpx_codec_flags_t init_flags); vpx_codec_flags_t init_flags);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_ #endif // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
* \brief Describes the vpx image descriptor and associated operations * \brief Describes the vpx image descriptor and associated operations
* *
*/ */
#ifndef VPX_VPX_IMAGE_H_
#define VPX_VPX_IMAGE_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef VPX_VPX_IMAGE_H_
#define VPX_VPX_IMAGE_H_
/*!\brief Current ABI version number /*!\brief Current ABI version number
* *
* \internal * \internal
...@@ -237,7 +237,8 @@ extern "C" { ...@@ -237,7 +237,8 @@ extern "C" {
*/ */
void vpx_img_free(vpx_image_t *img); void vpx_img_free(vpx_image_t *img);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} } // extern "C"
#endif
#endif // VPX_VPX_IMAGE_H_ #endif // VPX_VPX_IMAGE_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment