wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 941296 - Fix type conversion errors on 32-bit MacOS. r=cpearce

Browse Source 
UInt32 is an unsigned long on i686 while uint32_t is an unsigned int.
The compiler can't covert from a pointer to one to the pointer to
the other, so just use the MacOS type.

There's no problem on 64-bit.
This commit is contained in:
Ralph Giles 2014-07-26 23:43:00 -07:00
parent 74a7e5cb1c
commit ee6e2e7884
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/media/fmp4/apple/AppleATDecoder.cpp
View File

@ -158,7 +158,7 @@ AppleATDecoder::Shutdown()
void
AppleATDecoder::MetadataCallback(AudioFileStreamID aFileStream,
AudioFileStreamPropertyID aPropertyID,
uint32_t* aFlags)
UInt32* aFlags)
{
if (aPropertyID == kAudioFileStreamProperty_ReadyToProducePackets) {
SetupDecoder();
@ -245,7 +245,7 @@ AppleATDecoder::SampleCallback(uint32_t aNumBytes,
// in: the max number of packets we can handle from the decoder.
// out: the number of packets the decoder is actually returning.
uint32_t numFrames = MAX_AUDIO_FRAMES;
UInt32 numFrames = MAX_AUDIO_FRAMES;
OSStatus rv = AudioConverterFillComplexBuffer(mConverter,
_PassthroughInputDataCallback,

2
content/media/fmp4/apple/AppleATDecoder.h
View File

@ -35,7 +35,7 @@ public:
// Internal callbacks for the platform C api. Don't call externally.
void MetadataCallback(AudioFileStreamID aFileStream,
AudioFileStreamPropertyID aPropertyID,
uint32_t* aFlags);
UInt32* aFlags);
void SampleCallback(uint32_t aNumBytes,
uint32_t aNumPackets,
const void* aData,