diff options
| author | Debargha Mukherjee <debargha@google.com> | 2012-08-08 16:12:23 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-08 16:12:23 -0700 |
| commit | b04e87c6abd33faf688d68611429dc155c4bff0f (patch) | |
| tree | f24339cc63432c7940109ba188fab382abbceff8 | |
| parent | c30838b383fcbbad09c77aa71968e2d675b9fddd (diff) | |
| parent | e5904465559ad1a417ad8794ead147b985278411 (diff) | |
| download | libvpx-b04e87c6abd33faf688d68611429dc155c4bff0f.tar libvpx-b04e87c6abd33faf688d68611429dc155c4bff0f.tar.gz libvpx-b04e87c6abd33faf688d68611429dc155c4bff0f.tar.bz2 libvpx-b04e87c6abd33faf688d68611429dc155c4bff0f.zip | |
Merge "a tiny fix for MSVC build" into experimental
| -rw-r--r-- | vp8/common/filter.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vp8/common/filter.c b/vp8/common/filter.c index dba5a3202..280274422 100644 --- a/vp8/common/filter.c +++ b/vp8/common/filter.c @@ -628,7 +628,12 @@ static void vp8_filter_block2d_8_c (kInterp_Extend - 1) + output_height + kInterp_Extend; const unsigned int max_intermediate_height = (kInterp_Extend - 1) + filter_max_height + kInterp_Extend; +#ifdef _MSC_VER + // MSVC does not support C99 style declaration + unsigned char intermediate_buffer[23 * 16]; +#else unsigned char intermediate_buffer[max_intermediate_height * filter_max_width]; +#endif const int intermediate_next_stride = 1 - intermediate_height * output_width; // Horizontal pass (src -> transposed intermediate). |