[SCM] libav/experimental: Make 1pass statistic collection in ffv1 put_symbol_inline() conditional to avoid slowdown when more statistic collection code is added.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 349d72870f403b884aba08da7be1ce66e72ad39f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 26 23:00:49 2010 +0000

    Make 1pass statistic collection in ffv1 put_symbol_inline() conditional to avoid slowdown when more statistic collection code is added.
    
    Originally committed as revision 25577 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 3da38dc..0f1433b 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -304,7 +304,9 @@ static av_always_inline av_flatten void put_symbol_inline(RangeCoder *c, uint8_t
 
 #define put_rac(C,S,B) \
 do{\
+    if(rc_stat){\
     rc_stat[*(S)][B]++;\
+    }\
     put_rac(C,S,B);\
 }while(0)
 
@@ -344,8 +346,7 @@ do{\
 }
 
 static void av_noinline put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
-    uint64_t rc_stat[256][2]; //we dont bother counting header bits.
-    put_symbol_inline(c, state, v, is_signed, rc_stat);
+    put_symbol_inline(c, state, v, is_signed, NULL);
 }
 
 static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, int is_signed){
@@ -493,7 +494,11 @@ static av_always_inline int encode_line(FFV1Context *s, int w, int_fast16_t *sam
         diff= fold(diff, bits);
 
         if(s->ac){
+            if(s->flags & CODEC_FLAG_PASS1){
             put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat);
+            }else{
+                put_symbol_inline(c, p->state[context], diff, 1, NULL);
+            }
         }else{
             if(context == 0) run_mode=1;
 

-- 
Libav/FFmpeg packaging