Merge branch 'eldruin_ffmpeg2'