Fix couple of compilation errors.

These couple of commits fix compilation errors that I've encountered trying to compile XBMC under Slackware64 14.1 with latest ffmpeg.git and libass 0.9.6 (locally compiled).