[FFmpeg-cvslog] swscale/tests/swscale: Initialize res to a non random error code

Michael Niedermayer git at videolan.org
Tue Jul 14 23:06:20 EEST 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 11 23:57:41 2020 +0200| [24c575e0aa6b469eeaa1bd8f7ffc0fe6732495d0] | committer: Michael Niedermayer

swscale/tests/swscale: Initialize res to a non random error code

Regression since: 3adffab073bc59af39dddd035168ac72bc9ffde3

-1 is consistent what other error paths return

Reviewed-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24c575e0aa6b469eeaa1bd8f7ffc0fe6732495d0
---

 libswscale/tests/swscale.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c
index 58870fdb78..845ced61bb 100644
--- a/libswscale/tests/swscale.c
+++ b/libswscale/tests/swscale.c
@@ -423,8 +423,10 @@ bad_option:
         for (x = 0; x < W * 4; x++)
             rgb_data[ x + y * 4 * W] = av_lfg_get(&rand);
     res = sws_scale(sws, rgb_src, rgb_stride, 0, H / 12, (uint8_t * const *) src, stride);
-    if (res < 0 || res != H)
+    if (res < 0 || res != H) {
+        res = -1;
         goto error;
+    }
     sws_freeContext(sws);
     av_free(rgb_data);
 



More information about the ffmpeg-cvslog mailing list