Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().

[ffmpeg] / libswscale / colorspace-test.c

diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c
index a1ec1be1b4aeefc061729571e4b10e40b6b6992e..4e7116f5dcde56b9463135535dbf01072c072659 100644 (file)
--- a/libswscale/colorspace-test.c
+++ b/libswscale/colorspace-test.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -66,12 +66,15 @@ int main(int argc, char **argv)
     int failedNum=0;
     int passedNum=0;
 
+    if (!srcBuffer || !dstBuffer)
+        return -1;
+
     av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
     args_parse(argc, argv);
     av_log(NULL, AV_LOG_INFO, "CPU capabilities forced to %x\n", cpu_caps);
     sws_rgb2rgb_init(cpu_caps);
 
-    for(funcNum=0; ; funcNum++){
+    for(funcNum=0; ; funcNum++) {
         struct func_info_s {
             int src_bpp;
             int dst_bpp;
@@ -105,7 +108,7 @@ int main(int argc, char **argv)
             FUNC(4, 2, rgb32tobgr15),
             FUNC(4, 2, rgb32tobgr16),
             FUNC(4, 3, rgb32tobgr24),
-            FUNC(4, 4, rgb32tobgr32),
+            FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */
             FUNC(0, 0, NULL)
         };
         int width;
@@ -118,13 +121,13 @@ int main(int argc, char **argv)
         av_log(NULL, AV_LOG_INFO,".");
         memset(srcBuffer, srcByte, SIZE);
 
-        for(width=63; width>0; width--){
+        for(width=63; width>0; width--) {
             int dstOffset;
-            for(dstOffset=128; dstOffset<196; dstOffset+=4){
+            for(dstOffset=128; dstOffset<196; dstOffset+=4) {
                 int srcOffset;
                 memset(dstBuffer, dstByte, SIZE);
 
-                for(srcOffset=128; srcOffset<196; srcOffset+=4){
+                for(srcOffset=128; srcOffset<196; srcOffset+=4) {
                     uint8_t *src= srcBuffer+srcOffset;
                     uint8_t *dst= dstBuffer+dstOffset;
                     const char *name=NULL;
@@ -139,24 +142,24 @@ int main(int argc, char **argv)
 
                     if(!srcBpp) break;
 
-                    for(i=0; i<SIZE; i++){
-                        if(srcBuffer[i]!=srcByte){
+                    for(i=0; i<SIZE; i++) {
+                        if(srcBuffer[i]!=srcByte) {
                             av_log(NULL, AV_LOG_INFO, "src damaged at %d w:%d src:%d dst:%d %s\n",
                                    i, width, srcOffset, dstOffset, name);
                             failed=1;
                             break;
                         }
                     }
-                    for(i=0; i<dstOffset; i++){
-                        if(dstBuffer[i]!=dstByte){
+                    for(i=0; i<dstOffset; i++) {
+                        if(dstBuffer[i]!=dstByte) {
                             av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
                                    i, width, srcOffset, dstOffset, name);
                             failed=1;
                             break;
                         }
                     }
-                    for(i=dstOffset + width*dstBpp; i<SIZE; i++){
-                        if(dstBuffer[i]!=dstByte){
+                    for(i=dstOffset + width*dstBpp; i<SIZE; i++) {
+                        if(dstBuffer[i]!=dstByte) {
                             av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
                                    i, width, srcOffset, dstOffset, name);
                             failed=1;