[FFmpeg-cvslog] Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 13:43:31 2013 +0200| [dff205cca315d31ba4fc7571ef55e2331140d5eb] | committer: Michael Niedermayer

Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'

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

Conflicts:
	libavformat/Makefile

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dff205cca315d31ba4fc7571ef55e2331140d5eb
---