From b45250e9d2d042c23123416fd80b65b75a9563e9 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Sat, 3 Mar 2012 18:57:07 +0100 Subject: [PATCH] applemedia: update signature of CMSampleBufferCreate and CMBlockBufferCreateWithMemoryBlock Change data type for counters passed on the stack from UInt32 to size_t. Fixes 64bit builds. --- sys/applemedia/cmapi.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/applemedia/cmapi.h b/sys/applemedia/cmapi.h index 0c1b74f545..28500f1e0f 100644 --- a/sys/applemedia/cmapi.h +++ b/sys/applemedia/cmapi.h @@ -142,9 +142,13 @@ struct _GstCMApi CMTime (* CMTimeMake) (int64_t value, int32_t timescale); OSStatus (* CMSampleBufferCreate) (CFAllocatorRef allocator, - CMBlockBufferRef blockBuf, Boolean unkBool, UInt32 unkDW1, UInt32 unkDW2, - CMFormatDescriptionRef fmtDesc, UInt32 unkCountA, UInt32 unkCountB, - const void * unkTimeData, UInt32 unkCountC, const void * unkDWordData, + CMBlockBufferRef blockBuf, Boolean dataReady, + void *makeDataReadyCallback, + void *makeDataReadyRefcon, + CMFormatDescriptionRef fmtDesc, size_t numSamples, + size_t numSampleTimingEntries, + const void *sampleTimingArray, + size_t numSampleSizeEntries, const size_t *sampleSizeArray, CMSampleBufferRef * sampleBuffer); Boolean (* CMSampleBufferDataIsReady) ( const CMSampleBufferRef buf); @@ -164,9 +168,10 @@ struct _GstCMApi CMSampleBufferRef (* FigSampleBufferRetain) (CMSampleBufferRef buf); OSStatus (* CMBlockBufferCreateWithMemoryBlock) - (CFAllocatorRef allocator, Byte * data, UInt32 size, - CFAllocatorRef dataAllocator, void *unk1, UInt32 sizeA, UInt32 sizeB, - Boolean unkBool, CMBlockBufferRef * blockBuffer); + (CFAllocatorRef allocator, void * memoryBlock, size_t blockLength, + CFAllocatorRef dataAllocator, void *customBlockSource, + size_t offsetToData, size_t dataLength, + int flags, CMBlockBufferRef * blockBuffer); SInt32 (* CMBlockBufferGetDataLength) (const CMBlockBufferRef buf); OSStatus (* CMBlockBufferGetDataPointer) ( const CMBlockBufferRef buf, UInt32 unk1, UInt32 unk2, UInt32 unk3,