aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cabac.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-12-08 00:35:08 +0000
committerMåns Rullgård <mans@mansr.com>2006-12-08 00:35:08 +0000
commit849f10351d673ced1db6f13e399876f22121f60c (patch)
tree779ae65e38d3070b7bf48ea6e6d89032a9e00521 /libavcodec/cabac.h
parentfb17fac8c7dd92c77cf93019510e15fdae418d16 (diff)
downloadffmpeg-849f10351d673ced1db6f13e399876f22121f60c.tar.gz
rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cabac.h')
-rw-r--r--libavcodec/cabac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 43fe78e3bb..f47406a9ea 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -363,7 +363,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){
refill(c);
}
-static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){
+static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){
//FIXME gcc generates duplicate load/stores for c->low and c->range
#define LOW "0"
#define RANGE "4"
@@ -631,7 +631,7 @@ static int get_cabac_bypass(CABACContext *c){
}
-static always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
+static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
asm volatile(
"movl "RANGE "(%1), %%ebx \n\t"