diff options
| -rw-r--r-- | vp8/encoder/encodeframe.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 1 | ||||
| -rw-r--r-- | vpx/vpx_integer.h | 13 |
3 files changed, 11 insertions, 4 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 4a936ec4a..2f3905fe6 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -830,6 +830,7 @@ void vp8_encode_frame(VP8_COMP *cpi) xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count; x->partition_info += xd->mode_info_stride * cpi->encoding_thread_count; + x->gf_active_ptr += cm->mb_cols * cpi->encoding_thread_count; } diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index c00494dcf..7feee4e9f 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -264,6 +264,7 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data) xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count; x->partition_info += xd->mode_info_stride * cpi->encoding_thread_count; + x->gf_active_ptr += cm->mb_cols * cpi->encoding_thread_count; if (mb_row == cm->mb_rows - 1) { diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index 9a06c1ac3..608760f8b 100644 --- a/vpx/vpx_integer.h +++ b/vpx/vpx_integer.h @@ -15,7 +15,7 @@ /* get ptrdiff_t, size_t, wchar_t, NULL */ #include <stddef.h> -#if defined(_MSC_VER) || defined(VPX_EMULATE_INTTYPES) +#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -24,10 +24,9 @@ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; -#if defined(_MSC_VER) +#if (defined(_MSC_VER) && (_MSC_VER < 1600)) typedef signed __int64 int64_t; typedef unsigned __int64 uint64_t; -#define PRId64 "I64d" #endif #ifdef HAVE_ARMV6 @@ -50,8 +49,14 @@ typedef unsigned int uintptr_t; #define __STDC_FORMAT_MACROS #endif #include <stdint.h> -#include <inttypes.h> #endif +/* VS2010 defines stdint.h, but not inttypes.h */ +#if defined(_MSC_VER) +#define PRId64 "I64d" +#else +#include <inttypes.h> +#endif + #endif |