Fixing for new x264 & ffmpeg