[FFmpeg-cvslog] Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 21:14:56 2014 +0200| [5b4c8aac97863b4830717db6cb2cd4e3093f9a88] | committer: Michael Niedermayer

Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'

* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5':
  hls: Factor the sequence computation

Conflicts:
	libavformat/hlsenc.c

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

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