[FFmpeg-devel] [PATCH 1/2] avfilter/tests/integral: Fix build warning after adjust the location

Jun Zhao mypopydev at gmail.com
Sun Feb 10 08:53:57 EET 2019


Fix build warning like "warning: ISO C90 forbids mixed declarations
and code" after adjust the location for malloc fail check.

Signed-off-by: Jun Zhao <mypopydev at gmail.com>
---
 libavfilter/tests/integral.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavfilter/tests/integral.c b/libavfilter/tests/integral.c
index 361bfd5..093ed39 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);
 
-- 
1.7.1



More information about the ffmpeg-devel mailing list