[mark4o]

An FFmpeg developer has already volunteered to continue the libav merges: http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-August/1...