RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242' 

* commit '0448f26c97c5ab4858d31e456a4f1738ae783242':
  hlsenc: keep the playlist to the correct number of items
  hlsenc: use the segment filename in the playlist entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-30 14:02:14 +01:00
parent 2ce43b37fc 0448f26c97
commit 19e1c8e4f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/hlsenc.c
View File

@ -48,6 +48,7 @@ typedef struct HLSContext {
int has_video; int has_video;
int64_t start_pts; int64_t start_pts;
int64_t end_pts; int64_t end_pts;
int nb_entries;
ListEntry *list; ListEntry *list;
ListEntry *end_list; ListEntry *end_list;
char *basename; char *basename;
@ -85,9 +86,7 @@ static int append_entry(HLSContext *hls, uint64_t duration)
if (!en) if (!en)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_get_frame_filename(en->name, sizeof(en->name), av_strlcpy(en->name, av_basename(hls->avf->filename), sizeof(en->name));
av_basename(hls->basename),
hls->number -1);
en->duration = duration; en->duration = duration;
en->next = NULL; en->next = NULL;
@ -99,11 +98,12 @@ static int append_entry(HLSContext *hls, uint64_t duration)
hls->end_list = en; hls->end_list = en;
if (hls->number >= hls->size) { if (hls->nb_entries >= hls->size) {
en = hls->list; en = hls->list;
hls->list = en->next; hls->list = en->next;
av_free(en); av_free(en);
} } else
hls->nb_entries++;
return 0; return 0;
} }