summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2013-12-05 01:41:10 +0100
committerCarl Eugen Hoyos <[email protected]>2013-12-09 10:39:12 +0100
commite28d96024bdf3016b9de468981e7b4a64ebe848b (patch)
tree803271e7fb6897b9b9bc4110e005a6e2fbf38efe
parentcebad79898a4b65d7c7ca66ba21a6cdb66e7bbd1 (diff)
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 <[email protected]> (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")
}