diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-10 09:50:31 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-11 10:04:38 -0700 |
| commit | b08e2e23eec181e9951df33cd704ac294c5407b6 (patch) | |
| tree | 8efc1ca8af18169b44e505ea3ac1d224c1d777ab /libvpx/vp8/encoder/bitstream.h | |
| parent | f0ceed9d146017d218d64ca946d5c2b31356389b (diff) | |
| download | android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.gz android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.bz2 android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.zip | |
libvpx: Roll latest libvpx and enable VP9 Encoder
Rolling latest libvpx from upstream and generating configurations with VP9
Encoder enabled. Updating a mistake in UPDATING file.
Upstream Hash: 1f08824d6db735e4cacb0419785a789395e42b2b
Change-Id: Ie2c45e2253ade4a9ce88ca640cae39a7ece2d8f4
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_ |