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 /vp9/encoder/vp9_firstpass.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 'vp9/encoder/vp9_firstpass.h')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_firstpass.h b/vp9/encoder/vp9_firstpass.h index f89e4cb1c..ca5b10080 100644 --- a/vp9/encoder/vp9_firstpass.h +++ b/vp9/encoder/vp9_firstpass.h @@ -12,6 +12,10 @@ #define VP9_ENCODER_VP9_FIRSTPASS_H_ #include "vp9/encoder/vp9_onyx_int.h" +#ifdef __cplusplus +extern "C" { +#endif + void vp9_init_first_pass(VP9_COMP *cpi); void vp9_first_pass(VP9_COMP *cpi); void vp9_end_first_pass(VP9_COMP *cpi); @@ -25,4 +29,8 @@ void vp9_get_one_pass_params(VP9_COMP *cpi); void vp9_get_one_pass_cbr_params(VP9_COMP *cpi); void vp9_get_svc_params(VP9_COMP *cpi); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP9_ENCODER_VP9_FIRSTPASS_H_ |