diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 15:54:38 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 16:03:44 +0400 |
commit | 50c0837801b21870fbd14327e4120309e454b258 (patch) | |
tree | 539895ca8a9a27248985fa1223bf59aa37066bec /libavformat/hlsenc.c | |
parent | dff205cca315d31ba4fc7571ef55e2331140d5eb (diff) | |
parent | 09c93b1b957f2049ea5fd8fb0e6f4d82680172f2 (diff) |
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 'libavformat/hlsenc.c')
-rw-r--r-- | libavformat/hlsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index af04d09d2f..dcd53e5f40 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -49,7 +49,7 @@ typedef struct HLSContext { int has_video; int64_t start_pts; int64_t end_pts; - int64_t duration; ///< last segment duration computed so far, in seconds + int64_t duration; // last segment duration computed so far, in seconds int nb_entries; ListEntry *list; ListEntry *end_list; |