ffmpeg rebased to master head, rev 6021615, 2013-05-02