Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:54:38 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 12:03:44 +0000 (14:03 +0200)
commit50c0837801b21870fbd14327e4120309e454b258
tree539895ca8a9a27248985fa1223bf59aa37066bec
parentdff205cca315d31ba4fc7571ef55e2331140d5eb
parent09c93b1b957f2049ea5fd8fb0e6f4d82680172f2
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@gmx.at>
libavformat/hlsenc.c