Revert fixes on Ubuntu 10.04 in order to accomodate ffmpeg >= 0.6