[SCM] libav/experimental: Increase ffv1 encoding speed from 65 to 80 fps by forcing some inlining.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fc3128c9d57ac7d3c572d87e3a0c5b8107eca3f4
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 26 01:59:14 2010 +0000

    Increase ffv1 encoding speed from 65 to 80 fps by forcing some inlining.
    
    Originally committed as revision 25571 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 0c0ba8d..3da38dc 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -299,7 +299,7 @@ static inline int get_context(PlaneContext *p, int_fast16_t *src, int_fast16_t *
         return p->quant_table[0][(L-LT) & 0xFF] + p->quant_table[1][(LT-T) & 0xFF] + p->quant_table[2][(T-RT) & 0xFF];
 }
 
-static inline void put_symbol_inline(RangeCoder *c, uint8_t *state, int v, int is_signed, uint64_t rc_stat[256][2]){
+static av_always_inline av_flatten void put_symbol_inline(RangeCoder *c, uint8_t *state, int v, int is_signed, uint64_t rc_stat[256][2]){
     int i;
 
 #define put_rac(C,S,B) \
@@ -459,7 +459,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int
 }
 
 #if CONFIG_FFV1_ENCODER
-static inline int encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
+static av_always_inline int encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
     PlaneContext * const p= &s->plane[plane_index];
     RangeCoder * const c= &s->c;
     int x;

-- 
Libav/FFmpeg packaging