[SCM] libav/experimental: revert 1.83 because it's not needed

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:46:03 UTC 2013


The following commit has been merged in the experimental branch:
commit 3de79d0dca959236c1b232d421cb8442a18784cc
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Sat Jan 21 02:33:01 2006 +0000

    revert 1.83 because it's not needed
    
    Originally committed as revision 4875 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 88fb49a..4a96f3e 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -25,8 +25,6 @@
 
 #include "mpegvideo.h"
 
-#include <zlib.h>
-
 #undef NDEBUG
 #include <assert.h>
 
@@ -3303,8 +3301,6 @@ static void iterative_me(SnowContext *s){
     const int b_height= s->b_height << s->block_max_depth;
     const int b_stride= b_width;
     int color[3];
-    const int first_crc_pass= 12;
-    uint32_t crcs[50];
 
     for(pass=0; pass<50; pass++){
         int change= 0;
@@ -3439,18 +3435,6 @@ static void iterative_me(SnowContext *s){
             }
         }
         av_log(NULL, AV_LOG_ERROR, "pass:%d changed:%d\n", pass, change);
-
-        if(pass >= first_crc_pass){
-            int i;
-            //FIXME can we hash just the blocks that were analysed?
-            crcs[pass]= crc32(crc32(0,NULL,0), (void*)s->block, b_stride*b_height*sizeof(BlockNode));
-            for(i=pass-1; i>=first_crc_pass; i--){
-                if(crcs[i] == crcs[pass]){
-                    change= 0;
-                    break;
-                }
-            }
-        }
         if(!change)
             break;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list