Changeset 1226

Show
Ignore:
Timestamp:
12/14/09 21:11:08 (8 months ago)
Author:
astrange
Message:

Apply patch overriding Apple's mp4v component again.

Closes #458.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/codecList.m4

    r1132 r1226  
    77Codec(k3ivxCodecInfoResID, CODEC_ID_MPEG4, "3ivx", "Decompresses video stored in 3ivx format.", '3IVD', '3ivd', '3IV2', '3iv2') 
    88Codec(kXVIDCodecInfoResID, CODEC_ID_MPEG4, "Xvid", "Decompresses video stored in Xvid format.", 'XVID', 'xvid', 'XviD', 'XVIX', 'BLZ0') 
    9 Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'RMP4', 'SEDG', 'WV1F', 'FMP4', 'SMP4', 'mp4v') 
     9Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'RMP4', 'SEDG', 'WV1F', 'FMP4', 'SMP4') 
     10ResourceOnly(<!// XXX: can we do this without claiming Apple's manufacturer (and thus unregistering their decoder)?!>) 
     11ResourceOnly(<!#define kCodecManufacturer 'appl'!>) 
     12ResourceOnly(<!#define kCodecVersion kFFusionCodecVersion + 0x10!>) 
     13Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'mp4v') 
     14ResourceOnly(<!#define kCodecVersion kFFusionCodecVersion!>) 
     15ResourceOnly(<!#define kCodecManufacturer kFFusionCodecManufacturer!>) 
    1016Codec(kH264CodecInfoResID, CODEC_ID_H264, "H.264", "Decompresses video stored in H.264 format.", 'H264', 'h264', 'X264', 'x264', 'DAVC', 'VSSH', 'AVC1', 'avc1') 
    1117Codec(kFLV1CodecInfoResID, CODEC_ID_FLV1, "Sorenson H.263", "Decompresses video stored in Sorenson H.263 format.", 'FLV1')