[FFmpeg-cvslog] Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 20:52:58 2014 +0200| [8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1] | committer: Michael Niedermayer

Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'

* commit 'c7603b3c243331057300337a61464e6ac4a605cb':
  hls: Print start_number as first sequence value

Conflicts:
	libavformat/hlsenc.c

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

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