Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:37:03 +0000 (10:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:38:03 +0000 (10:38 +0100)
commit641358addcffe0cca55c547316781b11e9315dbc
tree8abcbe8639b1c14841ec9b3536a8b7fbdb83d88b
parent1344c0453615a1f0141b11f5f4e3c640ee890afc
parent435214a757fc71d1680b12d6f930254cab3935d1
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>
Changelog
configure
libavformat/Makefile
libavformat/allformats.c
libavformat/hdsenc.c
libavformat/version.h