diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-08-15 09:32:37 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-08-15 09:32:37 -0700 |
| commit | ba6c59e9d7d7013b3906b6f4230b663422681848 (patch) | |
| tree | fd3686d3a1a5598e6ea35b0006cfeb5d40a9eaa3 /libvpx/tools_common.h | |
| parent | bbeabeb879e7fa51c6395ee7ad590617dfbd5299 (diff) | |
| download | libvpx-ba6c59e9d7d7013b3906b6f4230b663422681848.tar.gz | |
libvpx: Pull from upstream
Upstream hash: d4a47a6cc0d869bea3071c15bc61da6836026d0b
Pull latest libvpx from upstream. This fixes a few vp9 encoder bugs and
includes some optimizations. Also fixes a couple of configure flags in
x86 to be consistent with the rest.
Change-Id: Ic58e0b03cce832571a35ec73eec559cdf881d1f5
Diffstat (limited to 'libvpx/tools_common.h')
| -rw-r--r-- | libvpx/tools_common.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libvpx/tools_common.h b/libvpx/tools_common.h index 549e895ec..558413ea4 100644 --- a/libvpx/tools_common.h +++ b/libvpx/tools_common.h @@ -25,15 +25,10 @@ /* MSVS uses _f{seek,tell}i64. */ #define fseeko _fseeki64 #define ftello _ftelli64 -typedef long _off_t; // NOLINT - MSVS compatible type -typedef __int64 off_t; // fseeki64 compatible type -#define _OFF_T_DEFINED #elif defined(_WIN32) -/* MinGW defines off_t as long and uses f{seek,tell}o64/off64_t for large - * files. */ +/* MinGW uses f{seek,tell}o64 for large files. */ #define fseeko fseeko64 #define ftello ftello64 -#define off_t off64_t #endif /* _WIN32 */ #if CONFIG_OS_SUPPORT @@ -50,7 +45,6 @@ typedef __int64 off_t; // fseeki64 compatible type /* Use 32-bit file operations in WebM file format when building ARM * executables (.axf) with RVCT. */ #if !CONFIG_OS_SUPPORT -typedef long off_t; /* NOLINT */ #define fseeko fseek #define ftello ftell #endif /* CONFIG_OS_SUPPORT */ @@ -90,12 +84,13 @@ struct VpxRational { struct VpxInputContext { const char *filename; FILE *file; - off_t length; + int64_t length; struct FileTypeDetectionBuffer detect; enum VideoFileType file_type; uint32_t width; uint32_t height; - int use_i420; + vpx_img_fmt_t fmt; + vpx_bit_depth_t bit_depth; int only_i420; uint32_t fourcc; struct VpxRational framerate; @@ -125,7 +120,7 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame); typedef struct VpxInterface { const char *const name; const uint32_t fourcc; - vpx_codec_iface_t *(*const interface)(); + vpx_codec_iface_t *(*const codec_interface)(); } VpxInterface; int get_vpx_encoder_count(); |