[SCM] libav/experimental: fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:42:17 UTC 2013


The following commit has been merged in the experimental branch:
commit 2554db9b5f54c19f7341175027d7a66a057632ee
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Nov 25 19:26:46 2004 +0000

    fix for build on IRIX by (Michel Bardiaux {mbardiaux peaktime be})
    
    Originally committed as revision 3713 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index eeb84a0..2a4a7d3 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -430,6 +430,10 @@ typedef struct SnowContext{
     MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independant of MpegEncContext, so this will be removed then (FIXME/XXX)
 }SnowContext;
 
+#ifdef	__sgi
+// Avoid a name clash on SGI IRIX
+#undef	qexp
+#endif
 #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
 static const uint8_t qexp[8]={
     128, 140, 152, 166, 181, 197, 215, 235

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list