Updated for ffmpeg-1.1 & XCode 4.3