]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dff205c 09c93b1)
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)
* 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>
1  2 
libavformat/hlsenc.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/hlsenc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.