diff options
| author | James Zern <jzern@google.com> | 2014-01-24 10:47:00 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-24 10:47:00 -0800 |
| commit | 26c88ec14ed21dff9dcafd91e9caaeee51887be4 (patch) | |
| tree | a17df0fe09e29a13b9d093462946b1b9a079a7ed /vp8/encoder/encodeframe.h | |
| parent | 8b0537f631754c9b06a97ebc3ccc1e3f1dc05eea (diff) | |
| parent | 002ad40897cc3308ef3cfb579d3942615230ac0f (diff) | |
| download | libvpx-26c88ec14ed21dff9dcafd91e9caaeee51887be4.tar libvpx-26c88ec14ed21dff9dcafd91e9caaeee51887be4.tar.gz libvpx-26c88ec14ed21dff9dcafd91e9caaeee51887be4.tar.bz2 libvpx-26c88ec14ed21dff9dcafd91e9caaeee51887be4.zip | |
Merge changes I826655a7,I5164df72,Iba9b198c,Ide9a6846,I4f51ce85,I0e6aa00f,Ic334da9a,I252f5f8a,I7865db2d,I13b434b1
* changes:
test/: remove unnecessary extern "C"s
top-level: add extern "C" to headers
vpx_ports: add extern "C" to headers
vpx: add extern "C" to headers
vp9/encoder: add extern "C" to headers
vp9/decoder: add extern "C" to headers
vp9/common: add extern "C" to headers
vp8/encoder: add extern "C" to headers
vp8/decoder: add extern "C" to headers
vp8/common: add extern "C" to headers
Diffstat (limited to 'vp8/encoder/encodeframe.h')
| -rw-r--r-- | vp8/encoder/encodeframe.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp8/encoder/encodeframe.h b/vp8/encoder/encodeframe.h index 180596bf1..e185c1035 100644 --- a/vp8/encoder/encodeframe.h +++ b/vp8/encoder/encodeframe.h @@ -9,6 +9,10 @@ */ #ifndef VP8_ENCODER_ENCODEFRAME_H_ #define VP8_ENCODER_ENCODEFRAME_H_ + +#ifdef __cplusplus +extern "C" { +#endif extern void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x); extern void vp8_build_block_offsets(MACROBLOCK *x); @@ -24,4 +28,8 @@ extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_ENCODER_ENCODEFRAME_H_ |