[FFmpeg-cvslog] Remove gcc 2.95.3 remnants.

Carl Eugen Hoyos git at videolan.org
Wed Jun 29 10:11:07 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jun 29 10:07:39 2011 +0200| [4d08dfefa9911055fc89e94936bdbed7a6c4da36] | committer: Carl Eugen Hoyos

Remove gcc 2.95.3 remnants.

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

 doc/developer.texi         |    2 +-
 libavcodec/h264_cabac.c    |    2 +-
 libavcodec/x86/h264_i386.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/developer.texi b/doc/developer.texi
index 69c2951..c1ca096 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -54,7 +54,7 @@ These features are supported by all compilers we care about, so we will not
 accept patches to remove their use unless they absolutely do not impair
 clarity and performance.
 
-All code must compile with GCC 2.95 and GCC 3.3. Currently, FFmpeg also
+All code must compile with GCC 3.3. Currently, FFmpeg also
 compiles with several other compilers, such as the Compaq ccc compiler
 or Sun Studio 9, and we would like to keep it that way unless it would
 be exceedingly involved. To ensure compatibility, please do not use any
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index a373edb..3975a61 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1647,7 +1647,7 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT
             index[coeff_count++] = last;\
         }
         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) && HAVE_TEN_OPERANDS
+#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)
         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index,
                                                  last_coeff_ctx_base-significant_coeff_ctx_base, sig_off);
     } else {
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h
index 982e8aa..c2477ac 100644
--- a/libavcodec/x86/h264_i386.h
+++ b/libavcodec/x86/h264_i386.h
@@ -36,7 +36,7 @@
 
 //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
 //as that would make optimization work hard)
-#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && HAVE_TEN_OPERANDS
+#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
 static int decode_significance_x86(CABACContext *c, int max_coeff,
                                    uint8_t *significant_coeff_ctx_base,
                                    int *index, x86_reg last_off){



More information about the ffmpeg-cvslog mailing list