[SCM] libav/experimental: swscale-test: always use SWS_BILINEAR to convert from ref to src

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:15:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 6bbae4c8b3efd6287fbf1ff38494d8d74b5f330d
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Sun Sep 12 18:15:34 2010 +0000

    swscale-test: always use SWS_BILINEAR to convert from ref to src
    
    Originally committed as revision 32212 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c
index ec38ab0..1a8bfae 100644
--- a/libswscale/swscale-test.c
+++ b/libswscale/swscale-test.c
@@ -78,7 +78,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
                   int srcW, int srcH, int dstW, int dstH, int flags)
 {
     static enum PixelFormat cur_srcFormat;
-    static int cur_srcW, cur_srcH, cur_flags;
+    static int cur_srcW, cur_srcH;
     static uint8_t *src[4];
     static int srcStride[4];
     uint8_t *dst[4] = {0};
@@ -90,7 +90,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
     uint32_t crc = 0;
     int res = 0;
 
-    if (cur_srcFormat != srcFormat || cur_srcW != srcW || cur_srcH != srcH || cur_flags != flags) {
+    if (cur_srcFormat != srcFormat || cur_srcW != srcW || cur_srcH != srcH) {
         struct SwsContext *srcContext = NULL;
         int p;
 
@@ -110,7 +110,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
             }
         }
         srcContext = sws_getContext(w, h, PIX_FMT_YUVA420P, srcW, srcH,
-                                    srcFormat, flags, NULL, NULL, NULL);
+                                    srcFormat, SWS_BILINEAR, NULL, NULL, NULL);
         if (!srcContext) {
             fprintf(stderr, "Failed to get %s ---> %s\n",
                     av_pix_fmt_descriptors[PIX_FMT_YUVA420P].name,
@@ -125,7 +125,6 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
         cur_srcFormat = srcFormat;
         cur_srcW = srcW;
         cur_srcH = srcH;
-        cur_flags = flags;
     }
 
     av_image_fill_linesizes(dstStride, dstFormat, dstW);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list