[FFmpeg-cvslog] Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 30 14:02:14 2012 +0100| [19e1c8e4f203a9445aadfc683449968a59f9aa81] | committer: Michael Niedermayer

Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'

* commit '0448f26c97c5ab4858d31e456a4f1738ae783242':
  hlsenc: keep the playlist to the correct number of items
  hlsenc: use the segment filename in the playlist entry

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

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