aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-05 01:41:10 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-12-09 10:36:54 +0100
commit86d4d4b011f280f9d15083fad19e15aa7c4112ff (patch)
tree5176adccb1542c255572b40c26249bd83cf421fa
parent14f31df2ccf37466ee23d88e7525136be3f42222 (diff)
downloadffmpeg-86d4d4b011f280f9d15083fad19e15aa7c4112ff.tar.gz
avcodec/cabac: force get_cabac to be not inlined
works around bug in gccs inline asm register assignment Fixes Ticket3177 gcc from 4.4 to 4.6 is affected at least, no non affected gccs known clang seems not affected Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5)
-rw-r--r--libavcodec/cabac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 385721fe1d..d8f34c8602 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -305,7 +305,7 @@ STOP_TIMER("get_cabac_bypass")
for(i=0; i<SIZE; i++){
START_TIMER
- if( (r[i]&1) != get_cabac(&c, state) )
+ if( (r[i]&1) != get_cabac_noinline(&c, state) )
av_log(NULL, AV_LOG_ERROR, "CABAC failure at %d\n", i);
STOP_TIMER("get_cabac")
}