[FFmpeg-cvslog] Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 14:04:57 2013 +0200| [c02945b6d27af0e277434780c01bae8d40f5fd24] | committer: Michael Niedermayer

Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'

* commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a':
  hlsenc: Don't reset the number variable when wrapping

Conflicts:
	libavformat/hlsenc.c

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

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