Author: pluto Date: Wed Dec 13 11:54:31 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - 4.2 fixes.
---- Files affected: SOURCES: mpeg4ip-gcc4.patch (1.2 -> 1.3) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mpeg4ip-gcc4.patch diff -u /dev/null SOURCES/mpeg4ip-gcc4.patch:1.3 --- /dev/null Wed Dec 13 12:54:31 2006 +++ SOURCES/mpeg4ip-gcc4.patch Wed Dec 13 12:54:26 2006 @@ -0,0 +1,36 @@ +--- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp.orig 2005-05-04 19:55:58.000000000 +0000 ++++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp 2006-12-13 10:15:12.283713250 +0000 +@@ -89,12 +89,9 @@ + #define transpPixel CPixel(0,0,0,0) + #define opaquePixel CPixel(255,255,255,255) + +-#ifndef max +-#define max(a,b) (((a) > (b)) ? (a) : (b)) +-#endif +-#ifndef min +-#define min(a, b) (((a) < (b)) ? (a) : (b)) +-#endif ++static inline long min( long x, long y ) { return ( ( x < y ) ? x : y ); } ++static inline long max( long x, long y ) { return ( ( x > y ) ? x : y ); } ++ + #define signOf(x) (((x) > 0) ? 1 : 0) + #define invSignOf(x) ((x) > 0 ? 0 : 1) // see p.22/H.263 + #define sign(x) ((x) > 0 ? 1 : -1) // see p.22/H.263 +--- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp.orig 2005-05-04 19:56:00.000000000 +0000 ++++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp 2006-12-13 10:41:07.856930500 +0000 +@@ -317,13 +317,13 @@ + iHalfY = m_vctTrueHalfPel.y - iMVY * 2; + } + +-Void CMotionVector::setToZero (Void) ++Void CMotionVector::setToZero () + { + memset (this, 0, sizeof (*this)); + } + + // RRV insertion +-Void CMotionVector::scaleup (Void) ++Void CMotionVector::scaleup () + { + if(m_vctTrueHalfPel.x == 0){ + m_vctTrueHalfPel_x2.x = 0; ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit