From 9f33b0ed392f508ddcd6299c89beeed5addce3ff Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 10 Feb 2019 14:28:22 +0800 Subject: [PATCH] avfilter/tests/integral: Fix build warning after adjust the location Fix build warning like "warning: ISO C90 forbids mixed declarations and code" after adjust the location for malloc fail check. Reviewed-by: Michael Niedermayer Signed-off-by: Jun Zhao --- libavfilter/tests/integral.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavfilter/tests/integral.c b/libavfilter/tests/integral.c index 361bfd51e5..093ed39d5c 100644 --- a/libavfilter/tests/integral.c +++ b/libavfilter/tests/integral.c @@ -33,6 +33,9 @@ static void display_integral(const uint32_t *ii, int w, int h, int lz_32) int main(void) { int ret = 0, xoff, yoff; + uint32_t *ii_start; + uint32_t *ii_start2; + NLMeansDSPContext dsp = {0}; // arbitrary test source of size 6x4 and linesize=8 const int w = 6, h = 5, lz = 8; @@ -57,10 +60,8 @@ int main(void) if (!ii || !ii2) return -1; - uint32_t *ii_start = ii + ii_lz_32 + 1; // skip top 0-line and left 0-column - uint32_t *ii_start2 = ii2 + ii_lz_32 + 1; // skip top 0-line and left 0-column - - NLMeansDSPContext dsp = {0}; + ii_start = ii + ii_lz_32 + 1; // skip top 0-line and left 0-column + ii_start2 = ii2 + ii_lz_32 + 1; // skip top 0-line and left 0-column ff_nlmeans_init(&dsp);