Changeset 409
- Timestamp:
- 04/12/07 02:06:03 (1 year ago)
- Files:
-
- trunk/CodecIDs.h (modified) (1 diff)
- trunk/FFissionCodec/FFissionCodec.r (modified) (1 diff)
- trunk/FFissionCodec/FFissionDecoder.cpp (modified) (1 diff)
- trunk/ff_MovieImport.c (modified) (1 diff)
- trunk/ff_private.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/CodecIDs.h
r244 r409 69 69 kAudioFormatWMA1MS = 0x6D730160, 70 70 kAudioFormatWMA2MS = 0x6D730161, 71 kAudioFormatFlashADPCM = 'FlAd', 71 72 kVideoFormatMSMPEG4v3 = 'MP43', 72 73 kMPEG1VisualCodecType = 'MPEG', trunk/FFissionCodec/FFissionCodec.r
r219 r409 46 46 #define kComponentInfo "An AudioCodec that decodes WMA v2 into linear PCM" 47 47 #include "XCAResources.r" 48 49 #define kPrimaryResourceID 132 50 #define kComponentType 'adec' 51 #define kComponentSubtype kAudioFormatFlashADPCM 52 #define kComponentName "Flash ADPCM" 53 #define kComponentInfo "An AudioCodec that decodes Flash ADPCM into linear PCM" 54 #include "XCAResources.r" trunk/FFissionCodec/FFissionDecoder.cpp
r408 r409 35 35 { kAudioFormatWMA1MS, CODEC_ID_WMAV1 }, 36 36 { kAudioFormatWMA2MS, CODEC_ID_WMAV2 }, 37 { kAudioFormatFlashADPCM, CODEC_ID_ADPCM_SWF }, 37 38 { 0, CODEC_ID_NONE } 38 39 }; trunk/ff_MovieImport.c
r373 r409 85 85 register_avcodec(&wmav1_decoder); 86 86 register_avcodec(&wmav2_decoder); 87 register_avcodec(&adpcm_swf_decoder); 87 88 88 89 av_log_set_callback(FFMpegCodecprintf); trunk/ff_private.c
r402 r409 338 338 asbd->mFormatID = kAudioFormatDTS; 339 339 map->vbr = 1; 340 break; 341 case CODEC_ID_ADPCM_SWF: 342 asbd->mFormatID = kAudioFormatFlashADPCM; 340 343 break; 341 344 default:
