Merge pull request #2760 from aballier/ffmpeg_cleanups