[FFmpeg-cvslog] Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 13:54:38 2013 +0200| [50c0837801b21870fbd14327e4120309e454b258] | committer: Michael Niedermayer

Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2'

* commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2':
  hlsenc: Append the last incomplete segment when closing the output

Conflicts:
	libavformat/hlsenc.c

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

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