Fixes for Ubuntu 10.04
Fixes for ffmpeg-0.6