[SCM] libav/experimental: swscale-example: Remove hack to end loop by setting variables to break.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:49:59 UTC 2013


The following commit has been merged in the experimental branch:
commit e55ed689a264c78f332745598ea8c58a3422ee13
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Thu Aug 13 11:48:06 2009 +0000

    swscale-example: Remove hack to end loop by setting variables to break.
    
    Originally committed as revision 29505 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index ec73495..af959b1 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -180,6 +180,8 @@ static void selfTest(uint8_t *src[4], int stride[4], int w, int h){
 
     for (srcFormat = 0; srcFormat < PIX_FMT_NB; srcFormat++) {
         for (dstFormat = 0; dstFormat < PIX_FMT_NB; dstFormat++) {
+            int res = 0;
+
             printf("%s -> %s\n",
                    sws_format_name(srcFormat),
                    sws_format_name(dstFormat));
@@ -187,21 +189,11 @@ static void selfTest(uint8_t *src[4], int stride[4], int w, int h){
 
             srcW= w;
             srcH= h;
-            for (dstW=w - w/3; dstW<= 4*w/3; dstW+= w/3){
-                for (dstH=h - h/3; dstH<= 4*h/3; dstH+= h/3){
-                    for (flags=1; flags<33; flags*=2) {
-                        int res;
-
+            for (dstW=w - w/3; !res && dstW<= 4*w/3; dstW+= w/3)
+                for (dstH=h - h/3; !res && dstH<= 4*h/3; dstH+= h/3)
+                    for (flags=1; !res && flags<33; flags*=2)
                         res = doTest(src, stride, w, h, srcFormat, dstFormat,
                                      srcW, srcH, dstW, dstH, flags);
-                        if (res < 0) {
-                            dstW = 4 * w / 3;
-                            dstH = 4 * h / 3;
-                            flags = 33;
-                        }
-                    }
-                }
-            }
         }
     }
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list