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)
commit19e1c8e4f203a9445aadfc683449968a59f9aa81
treed0ff4a8f37f2e3dbd927c120bf519d76ac527010
parent2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf
parent0448f26c97c5ab4858d31e456a4f1738ae783242
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@gmx.at>
libavformat/hlsenc.c