Michael Niedermayer 641358addc Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-02 10:38:03 +01:00

16 KiB

Raw Blame History

View Raw