- ffmpeg2 fixes from upstream svn