[FFmpeg-cvslog] avcodec/cabac: force get_cabac to be not inlined

Michael Niedermayer git at videolan.org
Mon Dec 9 10:40:50 CET 2013


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  5 01:41:10 2013 +0100| [929100ae989c67b8b35962733657b2ac1fb34960] | committer: Carl Eugen Hoyos

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 at gmx.at>
(cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=929100ae989c67b8b35962733657b2ac1fb34960
---

 libavcodec/cabac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 14ef30a..ba59dab 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")
     }



More information about the ffmpeg-cvslog mailing list