diff options
Diffstat (limited to 'chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h')
| -rw-r--r-- | chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h b/chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h index f7ff5776352..ea1a6a4adfd 100644 --- a/chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h +++ b/chromium/third_party/libvpx/source/libvpx/vp8/common/blockd.h @@ -9,8 +9,8 @@ */ -#ifndef __INC_BLOCKD_H -#define __INC_BLOCKD_H +#ifndef VP8_COMMON_BLOCKD_H_ +#define VP8_COMMON_BLOCKD_H_ void vpx_log(const char *format, ...); @@ -20,6 +20,10 @@ void vpx_log(const char *format, ...); #include "treecoder.h" #include "vpx_ports/mem.h" +#ifdef __cplusplus +extern "C" { +#endif + /*#define DCPRED 1*/ #define DCPREDSIMTHRESH 0 #define DCPREDCNTTHRESH 3 @@ -297,4 +301,8 @@ typedef struct macroblockd extern void vp8_build_block_doffsets(MACROBLOCKD *x); extern void vp8_setup_block_dptrs(MACROBLOCKD *x); -#endif /* __INC_BLOCKD_H */ +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // VP8_COMMON_BLOCKD_H_ |