* qatar/master: Add an HDS live fragmenting muxer Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>