Made FFMPEG encoding work on old API in 12.04.
Merge remote-tracking branch 'juan/master'