Changeset 1131

Show
Ignore:
Timestamp:
08/28/09 20:58:14 (7 months ago)
Author:
astrange
Message:

Fix up audio codec resources and ids.

WMAV1 was using WMAV2's codec ID.
MP1 should use CODEC_ID_MP1.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/FFissionCodec/FFissionDecoder.cpp

    r1121 r1131  
    4949        { kAudioFormatXiphVorbis, CODEC_ID_VORBIS }, 
    5050        { kAudioFormatMPEGLayer2, CODEC_ID_MP2 }, 
    51         { kAudioFormatMPEGLayer1, CODEC_ID_MP2 }, 
     51        { kAudioFormatMPEGLayer1, CODEC_ID_MP1 }, 
    5252        { 0x6d730050, CODEC_ID_MP2 }, 
    5353        { kAudioFormatTTA, CODEC_ID_TTA }, 

  • trunk/codecList.m4

    r1120 r1131  
    4242 
    4343EntryPoint(kFFissionCodecManufacturer, kFFissionCodecVersion, kWMA1MSCodecResourceID, "FFissionDecoderEntry", cmpThreadSafeOnMac, ) 
    44 Codec(kWMA1MSCodecResourceID, CODEC_ID_WMAV1, "Windows Media Audio 1", "An AudioCodec that decodes WMA v1 into linear PCM", kAudioFormatWMA2MS) 
     44Codec(kWMA1MSCodecResourceID, CODEC_ID_WMAV1, "Windows Media Audio 1", "An AudioCodec that decodes WMA v1 into linear PCM", kAudioFormatWMA1MS) 
     45Codec(kWMA2MSCodecResourceID, CODEC_ID_WMAV2, "Windows Media Audio 2", "An AudioCodec that decodes WMA v2 into linear PCM", kAudioFormatWMA2MS) 
    4546Codec(kFlashADPCMCodecResourceID, CODEC_ID_ADPCM_SWF, "Flash ADPCM", "An AudioCodec that decodes Flash ADPCM into linear PCM", kAudioFormatFlashADPCM) 
    4647