Using ffmpeg from the Perian SVN.
Update some files.
Change AVCodecID back to CodecID.