Michael Niedermayer 50c0837801 Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2' ...

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

Conflicts:
	libavformat/hlsenc.c

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

2013-08-16 14:03:44 +02:00

9.3 KiB

Raw Blame History

View Raw