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:34:52 +0100
commit69a283e0d21e8f65f41a4308f06afcd06257a649 (patch)
tree0da61ceac652faa0baba943bd44b3dc8a1b716b3
parent624b83b3efa463eda3f3aa9c9be4792e67b0ab5f (diff)
downloadffmpeg-69a283e0d21e8f65f41a4308f06afcd06257a649.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 29b188bc31..dff0a91273 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -301,7 +301,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")
}