Merge branch 'eldruin_tool2' into eldruin_ffmpeg2