Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:43:31 +0000 (13:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:43:31 +0000 (13:43 +0200)
commitdff205cca315d31ba4fc7571ef55e2331140d5eb
tree0921f60a03d7b9e07bd59b47a9852bff9de31d4c
parent83386a1f62c06c841694657778526dfebc0ba685
parentc9031c7c1446a1a63eff7c0bf50d1ee559adf3fb
Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'

* commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb':
  hlsenc: Add a proper dependency on the mpegts muxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/Makefile