[SCM] libav/experimental: Simplify implicit_weight table init.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 72f86ec013714d15cdef4e9e541ab87f34b670ec
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Mar 3 10:57:38 2010 +0000

    Simplify implicit_weight table init.
    
    Originally committed as revision 22168 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 15c4147..0bc8739 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1435,16 +1435,14 @@ static void implicit_weight_table(H264Context *h){
         for(ref1=0; ref1 < h->ref_count[1]; ref1++){
             int poc1 = h->ref_list[1][ref1].poc;
             int td = av_clip(poc1 - poc0, -128, 127);
+            h->implicit_weight[ref0][ref1] = 32;
             if(td){
                 int tb = av_clip(cur_poc - poc0, -128, 127);
                 int tx = (16384 + (FFABS(td) >> 1)) / td;
-                int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
-                if(dist_scale_factor < -64 || dist_scale_factor > 128)
-                    h->implicit_weight[ref0][ref1] = 32;
-                else
+                int dist_scale_factor = (tb*tx + 32) >> 8;
+                if(dist_scale_factor >= -64 && dist_scale_factor <= 128)
                     h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
-            }else
-                h->implicit_weight[ref0][ref1] = 32;
+            }
         }
     }
 }

-- 
Libav/FFmpeg packaging