Fixes for latest ffmpeg (2.3.3)