diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-27 00:50:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 00:50:12 +0000 |
| commit | 7616a7e29066d65ecd1d6f54485360d3964c67bb (patch) | |
| tree | c051eed430b02e9a3b5275d65969e25b024e2733 /libvpx/vp8/encoder/bitstream.h | |
| parent | b2e48fbeea3ad651e5e1d00770cb3609c60bb3e7 (diff) | |
| parent | 2ec72e65689c948e92b826ae1e867bf369e72f13 (diff) | |
| download | android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.gz android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.bz2 android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.zip | |
am 2ec72e65: libvpx: Roll latest libvpx
* commit '2ec72e65689c948e92b826ae1e867bf369e72f13':
libvpx: Roll latest libvpx
Diffstat (limited to 'libvpx/vp8/encoder/bitstream.h')
| -rw-r--r-- | libvpx/vp8/encoder/bitstream.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libvpx/vp8/encoder/bitstream.h b/libvpx/vp8/encoder/bitstream.h index 455a94f..eef2d79 100644 --- a/libvpx/vp8/encoder/bitstream.h +++ b/libvpx/vp8/encoder/bitstream.h @@ -9,8 +9,12 @@ */ -#ifndef __INC_BITSTREAM_H -#define __INC_BITSTREAM_H +#ifndef VP8_ENCODER_BITSTREAM_H_ +#define VP8_ENCODER_BITSTREAM_H_ + +#ifdef __cplusplus +extern "C" { +#endif #if HAVE_EDSP void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount, @@ -43,4 +47,8 @@ void vp8_pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount); # define pack_mb_row_tokens(a,b) pack_mb_row_tokens_c(a,b) #endif +#ifdef __cplusplus +} // extern "C" #endif + +#endif // VP8_ENCODER_BITSTREAM_H_ |