# HG changeset patch
# User nenolod
# Date 1130176631 25200
# Node ID ae266b33f74c2403e19440a97114cc9477a506a8
# Parent  ca62d3600a75b15ff0588c7df1c0638497c81d69
[svn] - libmp4v2 now compiles

diff -r ca62d3600a75 -r ae266b33f74c Input/aac/libmp4v2/mp4atom.cpp
--- a/Input/aac/libmp4v2/mp4atom.cpp	Mon Oct 24 10:50:48 2005 -0700
+++ b/Input/aac/libmp4v2/mp4atom.cpp	Mon Oct 24 10:57:11 2005 -0700
@@ -274,7 +274,7 @@
 	u_int64_t pos = pFile->GetPosition();
 
 	VERBOSE_READ(pFile->GetVerbosity(), 
-		printf("ReadAtom: pos = 0x"LLX"\n", pos));
+		printf("ReadAtom: pos = 0x%llx\n", pos));
 
 	u_int64_t dataSize = pFile->ReadUInt32();
 
@@ -302,7 +302,7 @@
 	dataSize -= hdrSize;
 
 	VERBOSE_READ(pFile->GetVerbosity(), 
-		printf("ReadAtom: type = %s data-size = "LLU" (0x"LLX")\n", 
+		printf("ReadAtom: type = %s data-size = %llu (0x%llx)\n", 
 			type, dataSize, dataSize));
 
 	if (pos + hdrSize + dataSize > pParentAtom->GetEnd()) {
@@ -517,7 +517,7 @@
 
 		if (m_pFile->GetPosition() > m_end) {
 			VERBOSE_READ(GetVerbosity(), 
-				printf("ReadProperties: insufficient data for property: %s pos 0x"LLX" atom end 0x"LLX"\n",
+				printf("ReadProperties: insufficient data for property: %s pos 0x%llx atom end 0x%llx\n",
 					m_pProperties[i]->GetName(), 
 					m_pFile->GetPosition(), m_end)); 
 
diff -r ca62d3600a75 -r ae266b33f74c Input/aac/libmp4v2/mp4track.cpp
--- a/Input/aac/libmp4v2/mp4track.cpp	Mon Oct 24 10:50:48 2005 -0700
+++ b/Input/aac/libmp4v2/mp4track.cpp	Mon Oct 24 10:57:11 2005 -0700
@@ -246,7 +246,7 @@
 	*pNumBytes = sampleSize;
 
 	VERBOSE_READ_SAMPLE(m_pFile->GetVerbosity(),
-		printf("ReadSample: track %u id %u offset 0x"LLX" size %u (0x%x)\n",
+		printf("ReadSample: track %u id %u offset 0x%llx size %u (0x%x)\n",
 			m_trackId, sampleId, fileOffset, *pNumBytes, *pNumBytes));
 
 	bool bufferMalloc = false;
@@ -264,7 +264,7 @@
 			GetSampleTimes(sampleId, pStartTime, pDuration);
 
 			VERBOSE_READ_SAMPLE(m_pFile->GetVerbosity(),
-				printf("ReadSample:  start "LLU" duration "LLD"\n",
+				printf("ReadSample:  start %llu duration %lld\n",
 					(pStartTime ? *pStartTime : 0), 
 					(pDuration ? *pDuration : 0)));
 		}
@@ -272,7 +272,7 @@
 			*pRenderingOffset = GetSampleRenderingOffset(sampleId);
 
 			VERBOSE_READ_SAMPLE(m_pFile->GetVerbosity(),
-				printf("ReadSample:  renderingOffset "LLD"\n",
+				printf("ReadSample:  renderingOffset %lld\n",
 					*pRenderingOffset));
 		}
 		if (pIsSyncSample) {
@@ -395,7 +395,7 @@
 	m_pFile->WriteBytes(m_pChunkBuffer, m_chunkBufferSize);
 
 	VERBOSE_WRITE_SAMPLE(m_pFile->GetVerbosity(),
-		printf("WriteChunk: track %u offset 0x"LLX" size %u (0x%x) numSamples %u\n",
+		printf("WriteChunk: track %u offset 0x%llx size %u (0x%x) numSamples %u\n",
 			m_trackId, chunkOffset, m_chunkBufferSize, 
 			m_chunkBufferSize, m_chunkSamples));
 
@@ -1298,7 +1298,7 @@
 	*ppChunk = (u_int8_t*)MP4Malloc(*pChunkSize);
 
 	VERBOSE_READ_SAMPLE(m_pFile->GetVerbosity(),
-		printf("ReadChunk: track %u id %u offset 0x"LLX" size %u (0x%x)\n",
+		printf("ReadChunk: track %u id %u offset 0x%llx size %u (0x%x)\n",
 			m_trackId, chunkId, chunkOffset, *pChunkSize, *pChunkSize));
 
 	u_int64_t oldPos = m_pFile->GetPosition(); // only used in mode == 'w'
@@ -1332,7 +1332,7 @@
 	m_pChunkOffsetProperty->SetValue(chunkOffset, chunkId - 1);
 
 	VERBOSE_WRITE_SAMPLE(m_pFile->GetVerbosity(),
-		printf("RewriteChunk: track %u id %u offset 0x"LLX" size %u (0x%x)\n",
+		printf("RewriteChunk: track %u id %u offset 0x%llx size %u (0x%x)\n",
 			m_trackId, chunkId, chunkOffset, chunkSize, chunkSize)); 
 }