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/decoder/onyxd_int.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/decoder/onyxd_int.h')
| -rw-r--r-- | libvpx/vp8/decoder/onyxd_int.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libvpx/vp8/decoder/onyxd_int.h b/libvpx/vp8/decoder/onyxd_int.h index 54a98f7..8ef4894 100644 --- a/libvpx/vp8/decoder/onyxd_int.h +++ b/libvpx/vp8/decoder/onyxd_int.h @@ -9,8 +9,8 @@ */ -#ifndef ONYXD_INT_H_ -#define ONYXD_INT_H_ +#ifndef VP8_DECODER_ONYXD_INT_H_ +#define VP8_DECODER_ONYXD_INT_H_ #include "vpx_config.h" #include "vp8/common/onyxd.h" @@ -22,6 +22,10 @@ #include "ec_types.h" #endif +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { int ithread; @@ -148,4 +152,8 @@ int vp8_remove_decoder_instances(struct frame_buffers *fb); } while(0) #endif -#endif // ONYXD_INT_H_ +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // VP8_DECODER_ONYXD_INT_H_ |