[FFmpeg-cvslog] Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 21:29:04 2014 +0200| [554a1ecab7efbdaf10ab459d73152bfb6e355dfa] | committer: Michael Niedermayer

Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'

* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
	libavformat/hlsenc.c

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

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