diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 13:54:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 14:03:44 +0200 |
| commit | 50c0837801b21870fbd14327e4120309e454b258 (patch) | |
| tree | 539895ca8a9a27248985fa1223bf59aa37066bec /libavcodec/ffwavesynth.c | |
| parent | dff205cca315d31ba4fc7571ef55e2331140d5eb (diff) | |
| parent | 09c93b1b957f2049ea5fd8fb0e6f4d82680172f2 (diff) | |
| download | ffmpeg-50c0837801b21870fbd14327e4120309e454b258.tar.gz | |
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>
Diffstat (limited to 'libavcodec/ffwavesynth.c')
0 files changed, 0 insertions, 0 deletions