Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:02:14 +0000 (14:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:02:19 +0000 (14:02 +0100)
* 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@gmx.at>
1  2 
libavformat/hlsenc.c

Simple merge