summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-10-26 01:59:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-10-26 01:59:14 +0000
commitfc3128c9d57ac7d3c572d87e3a0c5b8107eca3f4 (patch)
tree51340bd45ea24cc0173bfd884d995119a0474013 /libavcodec/ffv1.c
parente1f51b8821e199833847188df4164695d04e2605 (diff)
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
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 0c0ba8d443..3da38dc27c 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;