From a57f3e6c7b6ccf15b67b61097ae158419e7fc81d Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 26 Jan 2008 18:22:55 +0000 Subject: [PATCH] Cygwin: Patches for xvid and mpeg4ip Updated to work with new nasm 2.x.x git-svn-id: svn://localhost/HandBrake/trunk@1235 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/patch-xvidcore-cygwin.patch | 86 +++--- contrib/patch_mpeg4ip_cygwin.patch | 548 +++++++++++++++++++----------------- 2 files changed, 338 insertions(+), 296 deletions(-) diff --git a/contrib/patch-xvidcore-cygwin.patch b/contrib/patch-xvidcore-cygwin.patch index 7b60510d..b186c829 100644 --- a/contrib/patch-xvidcore-cygwin.patch +++ b/contrib/patch-xvidcore-cygwin.patch @@ -1,34 +1,52 @@ -diff -Naur xvidcore/build/generic/configure xvidcore-patched/build/generic/configure ---- xvidcore/build/generic/configure 2005-12-30 09:45:30.000000000 -0500 -+++ xvidcore-patched/build/generic/configure 2007-01-01 18:43:27.953125000 -0500 -@@ -3844,10 +3844,9 @@ - [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*) - echo "$as_me:$LINENO: result: ok" >&5 - echo "${ECHO_T}ok" >&6 -- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" -- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" -- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -- SPECIFIC_CFLAGS="-mno-cygwin" -+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" -+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" -+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" - ;; - darwin*|raphsody*) - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" -diff -Naur xvidcore/build/generic/configure.in xvidcore-patched/build/generic/configure.in ---- xvidcore/build/generic/configure.in 2005-12-30 09:45:30.000000000 -0500 -+++ xvidcore-patched/build/generic/configure.in 2007-01-01 18:43:11.453125000 -0500 -@@ -281,10 +281,9 @@ - ;; - [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*) - AC_MSG_RESULT([ok]) -- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" -- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" -- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" -- SPECIFIC_CFLAGS="-mno-cygwin" -+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" -+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" -+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" - ;; - darwin*|raphsody*) - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" +diff -Naur xvidcoreOrg/build/generic/configure xvidcore/build/generic/configure +--- xvidcoreOrg/build/generic/configure 2006-11-01 10:39:36.000000000 +0000 ++++ xvidcore/build/generic/configure 2008-01-26 18:07:50.453125000 +0000 +@@ -3844,10 +3844,9 @@ + [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*) + echo "$as_me:$LINENO: result: ok" >&5 + echo "${ECHO_T}ok" >&6 +- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" +- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" +- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" +- SPECIFIC_CFLAGS="-mno-cygwin" ++ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" ++ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" ++ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" + ;; + darwin*|raphsody*) + STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" +@@ -4016,7 +4015,7 @@ + if test "$ac_nasm" = "yes" ; then + echo "$as_me:$LINENO: checking for nasm patch version" >&5 + echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6 +- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` ++ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1` + if test -z $nasm_patch ; then + nasm_patch=-1 + fi +diff -Naur xvidcoreOrg/build/generic/configure.in xvidcore/build/generic/configure.in +--- xvidcoreOrg/build/generic/configure.in 2006-11-01 10:38:16.000000000 +0000 ++++ xvidcore/build/generic/configure.in 2008-01-26 18:07:53.203125000 +0000 +@@ -281,10 +281,9 @@ + ;; + [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*) + AC_MSG_RESULT([ok]) +- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)" +- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)" +- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" +- SPECIFIC_CFLAGS="-mno-cygwin" ++ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" ++ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)" ++ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def" + ;; + darwin*|raphsody*) + STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" +@@ -363,7 +362,7 @@ + dnl Checking nasm patch version + dnl + AC_MSG_CHECKING([for nasm patch version]) +- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` ++ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1` + if test -z $nasm_patch ; then + nasm_patch=-1 + fi diff --git a/contrib/patch_mpeg4ip_cygwin.patch b/contrib/patch_mpeg4ip_cygwin.patch index 0bc19cda..012526a3 100644 --- a/contrib/patch_mpeg4ip_cygwin.patch +++ b/contrib/patch_mpeg4ip_cygwin.patch @@ -1,262 +1,286 @@ -diff -Naur mpeg4ip/lib/mp4v2/mp4.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4.cpp ---- mpeg4ip/lib/mp4v2/mp4.cpp 2005-03-30 20:41:58.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4.cpp 2007-02-09 22:39:28.000000000 +0100 -@@ -1678,9 +1678,9 @@ - extern "C" bool MP4GetTrackH264SeqPictHeaders (MP4FileHandle hFile, - MP4TrackId trackId, - uint8_t ***pSeqHeader, -- uint32_t **pSeqHeaderSize, -+ u_int32_t **pSeqHeaderSize, - uint8_t ***pPictHeader, -- uint32_t **pPictHeaderSize) -+ u_int32_t **pPictHeaderSize) - { - if (MP4_IS_VALID_FILE_HANDLE(hFile)) { - try { -diff -Naur mpeg4ip/lib/mp4v2/mp4.h /Users/pri/t/mpeg4ip/lib/mp4v2/mp4.h ---- mpeg4ip/lib/mp4v2/mp4.h 2005-03-30 20:41:58.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4.h 2007-02-09 22:39:42.000000000 +0100 -@@ -631,9 +631,9 @@ - - bool MP4GetTrackVideoMetadata(MP4FileHandle hFile, - MP4TrackId trackId, -- uint8_t **ppConfig, -- uint32_t *pConfigSize); -- -+ u_int8_t **ppConfig, -+ u_int32_t *pConfigSize); -+ - bool MP4GetTrackESConfiguration( - MP4FileHandle hFile, - MP4TrackId trackId, -@@ -654,9 +654,9 @@ - bool MP4GetTrackH264SeqPictHeaders(MP4FileHandle hFile, - MP4TrackId trackId, - uint8_t ***pSeqHeaders, -- uint32_t **pSeqHeaderSize, -+ u_int32_t **pSeqHeaderSize, - uint8_t ***pPictHeader, -- uint32_t **pPictHeaderSize); -+ u_int32_t **pPictHeaderSize); - bool MP4GetTrackH264LengthSize(MP4FileHandle hFile, - MP4TrackId trackId, - uint32_t *pLength); -diff -Naur mpeg4ip/lib/mp4v2/mp4container.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4container.cpp ---- mpeg4ip/lib/mp4v2/mp4container.cpp 2001-11-19 18:06:58.000000000 +0100 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4container.cpp 2007-02-09 22:10:23.000000000 +0100 -@@ -207,7 +207,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - -diff -Naur mpeg4ip/lib/mp4v2/mp4container.h /Users/pri/t/mpeg4ip/lib/mp4v2/mp4container.h ---- mpeg4ip/lib/mp4v2/mp4container.h 2001-11-19 18:06:58.000000000 +0100 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4container.h 2007-02-09 22:06:42.000000000 +0100 -@@ -1,24 +1,3 @@ --/* -- * The contents of this file are subject to the Mozilla Public -- * License Version 1.1 (the "License"); you may not use this file -- * except in compliance with the License. You may obtain a copy of -- * the License at http://www.mozilla.org/MPL/ -- * -- * Software distributed under the License is distributed on an "AS -- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -- * implied. See the License for the specific language governing -- * rights and limitations under the License. -- * -- * The Original Code is MPEG4IP. -- * -- * The Initial Developer of the Original Code is Cisco Systems Inc. -- * Portions created by Cisco Systems Inc. are -- * Copyright (C) Cisco Systems Inc. 2001. All Rights Reserved. -- * -- * Contributor(s): -- * Dave Mackie dmackie@cisco.com -- */ -- - #ifndef __MP4_CONTAINER_INCLUDED__ - #define __MP4_CONTAINER_INCLUDED__ - -diff -Naur mpeg4ip/lib/mp4v2/mp4descriptor.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4descriptor.cpp ---- mpeg4ip/lib/mp4v2/mp4descriptor.cpp 2004-02-12 03:06:02.000000000 +0100 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4descriptor.cpp 2007-02-09 22:24:17.000000000 +0100 -@@ -149,7 +149,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - -@@ -194,7 +194,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - for (u_int32_t i = 0; i < numProperties; i++) { -diff -Naur mpeg4ip/lib/mp4v2/mp4file.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file.cpp ---- mpeg4ip/lib/mp4v2/mp4file.cpp 2005-03-30 20:41:58.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file.cpp 2007-02-09 22:44:08.000000000 +0100 -@@ -1431,7 +1431,7 @@ - return trackId; - } - --MP4TrackId MP4File::AddCntlTrackDefault (uint32_t timeScale, -+MP4TrackId MP4File::AddCntlTrackDefault (u_int32_t timeScale, - MP4Duration sampleDuration, - const char *type) - { -@@ -1682,7 +1682,7 @@ - (MP4Property **)&pLength) == false) || - (avcCAtom->FindProperty("avcC.sequenceEntries.sequenceParameterSetNALUnit", - (MP4Property **)&pUnit) == false)) { -- VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); -+ //VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); - return false; - } - uint32_t count = pCount->GetValue(); -@@ -1692,7 +1692,7 @@ - for (uint32_t index = 0; index < count; index++) { - if (pLength->GetValue(index) == sequenceLen) { - uint8_t *seq; -- uint32_t seqlen; -+ u_int32_t seqlen; - pUnit->GetValue(&seq, &seqlen, index); - if (memcmp(seq, pSequence, sequenceLen) == 0) { - free(seq); -@@ -1724,8 +1724,8 @@ - (MP4Property **)&pLength) == false) || - (avcCAtom->FindProperty("avcC.pictureEntries.pictureParameterSetNALUnit", - (MP4Property **)&pUnit) == false)) { -- VERBOSE_ERROR(m_verbosity, -- WARNING("Could not find avcC picture table properties")); -+ //VERBOSE_ERROR(m_verbosity, -+ //WARNING("Could not find avcC picture table properties")); - return false; - } - uint32_t count = pCount->GetValue(); -@@ -1735,7 +1735,7 @@ - for (uint32_t index = 0; index < count; index++) { - if (pLength->GetValue(index) == pictLen) { - uint8_t *seq; -- uint32_t seqlen; -+ u_int32_t seqlen; - pUnit->GetValue(&seq, &seqlen, index); - if (memcmp(seq, pPict, pictLen) == 0) { - VERBOSE_WRITE(m_verbosity, -@@ -2472,9 +2472,9 @@ - - bool MP4File::GetTrackH264SeqPictHeaders (MP4TrackId trackId, - uint8_t ***pppSeqHeader, -- uint32_t **ppSeqHeaderSize, -+ u_int32_t **ppSeqHeaderSize, - uint8_t ***pppPictHeader, -- uint32_t **ppPictHeaderSize) -+ u_int32_t **ppPictHeaderSize) - { - uint32_t count; - -@@ -2490,15 +2490,15 @@ - (MP4Property **)&pSeqLen) == false) || - (avcCAtom->FindProperty("avcC.sequenceEntries.sequenceParameterSetNALUnit", - (MP4Property **)&pSeqVal) == false)) { -- VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); -+ //VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); - return false; - } - uint8_t **ppSeqHeader = - (uint8_t **)malloc((pSeqCount->GetValue() + 1) * sizeof(uint8_t *)); - *pppSeqHeader = ppSeqHeader; - -- uint32_t *pSeqHeaderSize = -- (uint32_t *)malloc((pSeqCount->GetValue() + 1) * sizeof(uint32_t *)); -+ u_int32_t *pSeqHeaderSize = -+ (u_int32_t *)malloc((pSeqCount->GetValue() + 1) * sizeof(u_int32_t *)); - - *ppSeqHeaderSize = pSeqHeaderSize; - for (count = 0; count < pSeqCount->GetValue(); count++) { -@@ -2513,15 +2513,15 @@ - (MP4Property **)&pPictLen) == false) || - (avcCAtom->FindProperty("avcC.pictureEntries.pictureParameterSetNALUnit", - (MP4Property **)&pPictVal) == false)) { -- VERBOSE_ERROR(m_verbosity, -- WARNING("Could not find avcC picture table properties")); -+ //VERBOSE_ERROR(m_verbosity, -+ //WARNING("Could not find avcC picture table properties")); - return false; - } - uint8_t - **ppPictHeader = - (uint8_t **)malloc((pPictCount->GetValue() + 1) * sizeof(uint8_t *)); -- uint32_t *pPictHeaderSize = -- (uint32_t *)malloc((pPictCount->GetValue() + 1)* sizeof(uint32_t *)); -+ u_int32_t *pPictHeaderSize = -+ (u_int32_t *)malloc((pPictCount->GetValue() + 1)* sizeof(u_int32_t *)); - *pppPictHeader = ppPictHeader; - *ppPictHeaderSize = pPictHeaderSize; - -diff -Naur mpeg4ip/lib/mp4v2/mp4file.h /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file.h ---- mpeg4ip/lib/mp4v2/mp4file.h 2005-03-30 20:41:58.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file.h 2007-02-09 22:35:21.000000000 +0100 -@@ -329,9 +329,9 @@ - uint8_t *pLevel); - bool GetTrackH264SeqPictHeaders(MP4TrackId trackId, - uint8_t ***pSeqHeader, -- uint32_t **pSeqHeaderSize, -+ u_int32_t **pSeqHeaderSize, - uint8_t ***pPictHeader, -- uint32_t **pPictHeaderSize); -+ u_int32_t **pPictHeaderSize); - void GetTrackH264LengthSize(MP4TrackId, - uint32_t *pLength); - const char* GetHintTrackSdp(MP4TrackId hintTrackId); -diff -Naur mpeg4ip/lib/mp4v2/mp4file_io.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file_io.cpp ---- mpeg4ip/lib/mp4v2/mp4file_io.cpp 2004-07-15 20:09:48.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4file_io.cpp 2007-02-09 22:44:47.000000000 +0100 -@@ -86,7 +86,7 @@ - } - - ASSERT(pBytes); -- WARNING(m_numReadBits > 0); -+ //WARNING(m_numReadBits > 0); - - if (pFile == NULL) { - pFile = m_pFile; -diff -Naur mpeg4ip/lib/mp4v2/mp4property.cpp /Users/pri/t/mpeg4ip/lib/mp4v2/mp4property.cpp ---- mpeg4ip/lib/mp4v2/mp4property.cpp 2004-08-23 20:28:21.000000000 +0200 -+++ /Users/pri/t/mpeg4ip/lib/mp4v2/mp4property.cpp 2007-02-09 22:47:04.000000000 +0100 -@@ -636,7 +636,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - -@@ -670,7 +670,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - -@@ -709,7 +709,7 @@ - u_int32_t numProperties = m_pProperties.Size(); - - if (numProperties == 0) { -- WARNING(numProperties == 0); -+ //WARNING(numProperties == 0); - return; - } - +diff -Naur mpeg4ipOrg/configure mpeg4ip/configure +--- mpeg4ipOrg/configure 2005-05-18 23:03:26.000000000 +0100 ++++ mpeg4ip/configure 2008-01-26 18:02:26.281250000 +0000 +@@ -27789,7 +27789,7 @@ + if test x$USENASM = xtrue; then + echo "$as_me:$LINENO: checking nasm version..." >&5 + echo $ECHO_N "checking nasm version...... $ECHO_C" >&6 +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`(nasm -r || nasm -v) | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +diff -Naur mpeg4ipOrg/configure.in mpeg4ip/configure.in +--- mpeg4ipOrg/configure.in 2005-05-18 22:21:34.000000000 +0100 ++++ mpeg4ip/configure.in 2008-01-26 18:02:32.125000000 +0000 +@@ -647,7 +647,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`(nasm -r || nasm -v) | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4.cpp mpeg4ip/lib/mp4v2/mp4.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4.cpp 2005-03-30 19:41:58.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4.cpp 2008-01-26 17:58:21.828125000 +0000 +@@ -1678,9 +1678,9 @@ + extern "C" bool MP4GetTrackH264SeqPictHeaders (MP4FileHandle hFile, + MP4TrackId trackId, + uint8_t ***pSeqHeader, +- uint32_t **pSeqHeaderSize, ++ u_int32_t **pSeqHeaderSize, + uint8_t ***pPictHeader, +- uint32_t **pPictHeaderSize) ++ u_int32_t **pPictHeaderSize) + { + if (MP4_IS_VALID_FILE_HANDLE(hFile)) { + try { +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4.h mpeg4ip/lib/mp4v2/mp4.h +--- mpeg4ipOrg/lib/mp4v2/mp4.h 2005-03-30 19:41:58.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4.h 2008-01-26 17:58:21.921875000 +0000 +@@ -631,9 +631,9 @@ + + bool MP4GetTrackVideoMetadata(MP4FileHandle hFile, + MP4TrackId trackId, +- uint8_t **ppConfig, +- uint32_t *pConfigSize); +- ++ u_int8_t **ppConfig, ++ u_int32_t *pConfigSize); ++ + bool MP4GetTrackESConfiguration( + MP4FileHandle hFile, + MP4TrackId trackId, +@@ -654,9 +654,9 @@ + bool MP4GetTrackH264SeqPictHeaders(MP4FileHandle hFile, + MP4TrackId trackId, + uint8_t ***pSeqHeaders, +- uint32_t **pSeqHeaderSize, ++ u_int32_t **pSeqHeaderSize, + uint8_t ***pPictHeader, +- uint32_t **pPictHeaderSize); ++ u_int32_t **pPictHeaderSize); + bool MP4GetTrackH264LengthSize(MP4FileHandle hFile, + MP4TrackId trackId, + uint32_t *pLength); +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4container.cpp mpeg4ip/lib/mp4v2/mp4container.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4container.cpp 2001-11-19 17:06:58.000000000 +0000 ++++ mpeg4ip/lib/mp4v2/mp4container.cpp 2008-01-26 17:58:21.937500000 +0000 +@@ -207,7 +207,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4container.h mpeg4ip/lib/mp4v2/mp4container.h +--- mpeg4ipOrg/lib/mp4v2/mp4container.h 2001-11-19 17:06:58.000000000 +0000 ++++ mpeg4ip/lib/mp4v2/mp4container.h 2008-01-26 17:58:21.953125000 +0000 +@@ -1,24 +1,3 @@ +-/* +- * The contents of this file are subject to the Mozilla Public +- * License Version 1.1 (the "License"); you may not use this file +- * except in compliance with the License. You may obtain a copy of +- * the License at http://www.mozilla.org/MPL/ +- * +- * Software distributed under the License is distributed on an "AS +- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +- * implied. See the License for the specific language governing +- * rights and limitations under the License. +- * +- * The Original Code is MPEG4IP. +- * +- * The Initial Developer of the Original Code is Cisco Systems Inc. +- * Portions created by Cisco Systems Inc. are +- * Copyright (C) Cisco Systems Inc. 2001. All Rights Reserved. +- * +- * Contributor(s): +- * Dave Mackie dmackie@cisco.com +- */ +- + #ifndef __MP4_CONTAINER_INCLUDED__ + #define __MP4_CONTAINER_INCLUDED__ + +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4descriptor.cpp mpeg4ip/lib/mp4v2/mp4descriptor.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4descriptor.cpp 2004-02-12 02:06:02.000000000 +0000 ++++ mpeg4ip/lib/mp4v2/mp4descriptor.cpp 2008-01-26 17:58:21.968750000 +0000 +@@ -149,7 +149,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + +@@ -194,7 +194,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + for (u_int32_t i = 0; i < numProperties; i++) { +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4file.cpp mpeg4ip/lib/mp4v2/mp4file.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4file.cpp 2005-03-30 19:41:58.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4file.cpp 2008-01-26 17:58:22.109375000 +0000 +@@ -1431,7 +1431,7 @@ + return trackId; + } + +-MP4TrackId MP4File::AddCntlTrackDefault (uint32_t timeScale, ++MP4TrackId MP4File::AddCntlTrackDefault (u_int32_t timeScale, + MP4Duration sampleDuration, + const char *type) + { +@@ -1682,7 +1682,7 @@ + (MP4Property **)&pLength) == false) || + (avcCAtom->FindProperty("avcC.sequenceEntries.sequenceParameterSetNALUnit", + (MP4Property **)&pUnit) == false)) { +- VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); ++ //VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); + return false; + } + uint32_t count = pCount->GetValue(); +@@ -1692,7 +1692,7 @@ + for (uint32_t index = 0; index < count; index++) { + if (pLength->GetValue(index) == sequenceLen) { + uint8_t *seq; +- uint32_t seqlen; ++ u_int32_t seqlen; + pUnit->GetValue(&seq, &seqlen, index); + if (memcmp(seq, pSequence, sequenceLen) == 0) { + free(seq); +@@ -1724,8 +1724,8 @@ + (MP4Property **)&pLength) == false) || + (avcCAtom->FindProperty("avcC.pictureEntries.pictureParameterSetNALUnit", + (MP4Property **)&pUnit) == false)) { +- VERBOSE_ERROR(m_verbosity, +- WARNING("Could not find avcC picture table properties")); ++ //VERBOSE_ERROR(m_verbosity, ++ //WARNING("Could not find avcC picture table properties")); + return false; + } + uint32_t count = pCount->GetValue(); +@@ -1735,7 +1735,7 @@ + for (uint32_t index = 0; index < count; index++) { + if (pLength->GetValue(index) == pictLen) { + uint8_t *seq; +- uint32_t seqlen; ++ u_int32_t seqlen; + pUnit->GetValue(&seq, &seqlen, index); + if (memcmp(seq, pPict, pictLen) == 0) { + VERBOSE_WRITE(m_verbosity, +@@ -2472,9 +2472,9 @@ + + bool MP4File::GetTrackH264SeqPictHeaders (MP4TrackId trackId, + uint8_t ***pppSeqHeader, +- uint32_t **ppSeqHeaderSize, ++ u_int32_t **ppSeqHeaderSize, + uint8_t ***pppPictHeader, +- uint32_t **ppPictHeaderSize) ++ u_int32_t **ppPictHeaderSize) + { + uint32_t count; + +@@ -2490,15 +2490,15 @@ + (MP4Property **)&pSeqLen) == false) || + (avcCAtom->FindProperty("avcC.sequenceEntries.sequenceParameterSetNALUnit", + (MP4Property **)&pSeqVal) == false)) { +- VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); ++ //VERBOSE_ERROR(m_verbosity, WARNING("Could not find avcC properties")); + return false; + } + uint8_t **ppSeqHeader = + (uint8_t **)malloc((pSeqCount->GetValue() + 1) * sizeof(uint8_t *)); + *pppSeqHeader = ppSeqHeader; + +- uint32_t *pSeqHeaderSize = +- (uint32_t *)malloc((pSeqCount->GetValue() + 1) * sizeof(uint32_t *)); ++ u_int32_t *pSeqHeaderSize = ++ (u_int32_t *)malloc((pSeqCount->GetValue() + 1) * sizeof(u_int32_t *)); + + *ppSeqHeaderSize = pSeqHeaderSize; + for (count = 0; count < pSeqCount->GetValue(); count++) { +@@ -2513,15 +2513,15 @@ + (MP4Property **)&pPictLen) == false) || + (avcCAtom->FindProperty("avcC.pictureEntries.pictureParameterSetNALUnit", + (MP4Property **)&pPictVal) == false)) { +- VERBOSE_ERROR(m_verbosity, +- WARNING("Could not find avcC picture table properties")); ++ //VERBOSE_ERROR(m_verbosity, ++ //WARNING("Could not find avcC picture table properties")); + return false; + } + uint8_t + **ppPictHeader = + (uint8_t **)malloc((pPictCount->GetValue() + 1) * sizeof(uint8_t *)); +- uint32_t *pPictHeaderSize = +- (uint32_t *)malloc((pPictCount->GetValue() + 1)* sizeof(uint32_t *)); ++ u_int32_t *pPictHeaderSize = ++ (u_int32_t *)malloc((pPictCount->GetValue() + 1)* sizeof(u_int32_t *)); + *pppPictHeader = ppPictHeader; + *ppPictHeaderSize = pPictHeaderSize; + +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4file.h mpeg4ip/lib/mp4v2/mp4file.h +--- mpeg4ipOrg/lib/mp4v2/mp4file.h 2005-03-30 19:41:58.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4file.h 2008-01-26 17:58:22.171875000 +0000 +@@ -329,9 +329,9 @@ + uint8_t *pLevel); + bool GetTrackH264SeqPictHeaders(MP4TrackId trackId, + uint8_t ***pSeqHeader, +- uint32_t **pSeqHeaderSize, ++ u_int32_t **pSeqHeaderSize, + uint8_t ***pPictHeader, +- uint32_t **pPictHeaderSize); ++ u_int32_t **pPictHeaderSize); + void GetTrackH264LengthSize(MP4TrackId, + uint32_t *pLength); + const char* GetHintTrackSdp(MP4TrackId hintTrackId); +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4file_io.cpp mpeg4ip/lib/mp4v2/mp4file_io.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4file_io.cpp 2004-07-15 19:09:48.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4file_io.cpp 2008-01-26 17:58:22.218750000 +0000 +@@ -86,7 +86,7 @@ + } + + ASSERT(pBytes); +- WARNING(m_numReadBits > 0); ++ //WARNING(m_numReadBits > 0); + + if (pFile == NULL) { + pFile = m_pFile; +diff -Naur mpeg4ipOrg/lib/mp4v2/mp4property.cpp mpeg4ip/lib/mp4v2/mp4property.cpp +--- mpeg4ipOrg/lib/mp4v2/mp4property.cpp 2004-08-23 19:28:22.000000000 +0100 ++++ mpeg4ip/lib/mp4v2/mp4property.cpp 2008-01-26 17:58:22.265625000 +0000 +@@ -636,7 +636,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + +@@ -670,7 +670,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + +@@ -709,7 +709,7 @@ + u_int32_t numProperties = m_pProperties.Size(); + + if (numProperties == 0) { +- WARNING(numProperties == 0); ++ //WARNING(numProperties == 0); + return; + } + -- 2.11.0