diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-26 15:13:32 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-26 15:13:32 -0700 |
| commit | 2ec72e65689c948e92b826ae1e867bf369e72f13 (patch) | |
| tree | 09d08252ba727c6c2e090222ea15ccc3b143301a /libvpx/webmenc.h | |
| parent | 9b35249446b07f40ac5fcc3205f2c048616efacc (diff) | |
| download | android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.gz android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.bz2 android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.zip | |
libvpx: Roll latest libvpx
Pulling changes related to fixing a rare bitstream issue on video upscaling.
Also enables VP9 encoder. This is exactly the same as the roll that is
already in master.
Upstream Hash: 8e9c9f118cda45013f14cce7961dcc8df78ffebf
Change-Id: Iba9bb1c1804462014deab20fa6f4c5e4c55a778e
Diffstat (limited to 'libvpx/webmenc.h')
| -rw-r--r-- | libvpx/webmenc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libvpx/webmenc.h b/libvpx/webmenc.h index f3bc3ec..362aa89 100644 --- a/libvpx/webmenc.h +++ b/libvpx/webmenc.h @@ -23,6 +23,10 @@ typedef __int64 off_t; #include "tools_common.h" #include "vpx/vpx_encoder.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef off_t EbmlLoc; struct cue_entry { @@ -84,4 +88,8 @@ void write_webm_block(struct EbmlGlobal *glob, void write_webm_file_footer(struct EbmlGlobal *glob, int hash); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // WEBMENC_H_ |