diff options
| author | hkuang <hkuang@google.com> | 2013-11-07 15:50:31 -0800 |
|---|---|---|
| committer | hkuang <hkuang@google.com> | 2013-11-08 11:40:06 -0800 |
| commit | 5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (patch) | |
| tree | 0d891d2cbbac4c3da6fd15a25bf8797b29b31994 /libvpx/vpx/vpx_encoder.h | |
| parent | e6eeaaa14ccef4c0938fcce21c54979204041a30 (diff) | |
| download | android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.gz android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.bz2 android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.zip | |
Roll latest libvpx into Android.
The lastest libvpx just added multithread tile decoding support.
Checkout is from master: abdefeaa89a0908327518e5ca75c935c66b2e1aa
Bug:11576718
Change-Id: Icbe5430633e179b8dc6d419e280ad7ebd3cad4a0
Diffstat (limited to 'libvpx/vpx/vpx_encoder.h')
| -rw-r--r-- | libvpx/vpx/vpx_encoder.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libvpx/vpx/vpx_encoder.h b/libvpx/vpx/vpx_encoder.h index 56fd2d9..56752cf 100644 --- a/libvpx/vpx/vpx_encoder.h +++ b/libvpx/vpx/vpx_encoder.h @@ -7,7 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ - +#ifndef VPX_ENCODER_H +#define VPX_ENCODER_H /*!\defgroup encoder Encoder Algorithm Interface * \ingroup codec @@ -28,8 +29,6 @@ extern "C" { #endif -#ifndef VPX_ENCODER_H -#define VPX_ENCODER_H #include "vpx_codec.h" /*! Temporal Scalability: Maximum length of the sequence defining frame @@ -930,8 +929,8 @@ extern "C" { /*!@} - end defgroup encoder*/ - -#endif #ifdef __cplusplus } #endif +#endif + |