diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-02-28 16:25:38 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-03-01 11:06:05 -0800 |
| commit | 69c67c9531b08c1b15985b351677a162739af43e (patch) | |
| tree | 5e07512832085e972ce4bdc7e96472d2c4f5c545 /vpxenc.c | |
| parent | db4dc6f0c0c30f56d675a489c93b22517eedb9f8 (diff) | |
| parent | a07bed2b2b2ca84fdb145ee8e4f1ca100d39915e (diff) | |
| download | libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.gz libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.bz2 libvpx-69c67c9531b08c1b15985b351677a162739af43e.zip | |
Merge master branch into experimental
Picks up some build system changes, compiler warning fixes, etc.
Change-Id: I2712f99e653502818a101a72696ad54018152d4e
Diffstat (limited to 'vpxenc.c')
| -rw-r--r-- | vpxenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ #include "vpx_config.h" -#if defined(_WIN32) || !CONFIG_OS_SUPPORT +#if defined(_WIN32) || defined(__OS2__) || !CONFIG_OS_SUPPORT #define USE_POSIX_MMAP 0 #else #define USE_POSIX_MMAP 1 |