mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
commit
50c0837801
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue