virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

lavf/segment: fix value for the M3U8 EXT-X-MEDIA

Browse Source 
From the M3U8 specification:
|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first
|URI that appears in a Playlist file.

Previously it was using the list index number. Also remove now unused
list_count field.
This commit is contained in:
Stefano Sabatini 2012-11-17 17:21:43 +01:00
parent 5a1ac463e0
commit 8b6aeb1fcd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/segment.c
View File

@ -58,7 +58,6 @@ typedef struct {
AVFormatContext *avf; AVFormatContext *avf;
char *format; ///< format to use for output segment files char *format; ///< format to use for output segment files
char *list; ///< filename for the segment list file char *list; ///< filename for the segment list file
int list_count; ///< list counter
int list_flags; ///< flags affecting list generation int list_flags; ///< flags affecting list generation
int list_size; ///< number of entries for the segment list file int list_size; ///< number of entries for the segment list file
double list_max_segment_time; ///< max segment time in the current list double list_max_segment_time; ///< max segment time in the current list
@ -182,7 +181,7 @@ static int segment_list_open(AVFormatContext *s)
if (seg->list_type == LIST_TYPE_M3U8) { if (seg->list_type == LIST_TYPE_M3U8) {
avio_printf(seg->list_pb, "#EXTM3U\n"); avio_printf(seg->list_pb, "#EXTM3U\n");
avio_printf(seg->list_pb, "#EXT-X-VERSION:3\n"); avio_printf(seg->list_pb, "#EXT-X-VERSION:3\n");
avio_printf(seg->list_pb, "#EXT-X-MEDIA-SEQUENCE:%d\n", seg->list_count); avio_printf(seg->list_pb, "#EXT-X-MEDIA-SEQUENCE:%d\n", seg->segment_idx);
avio_printf(seg->list_pb, "#EXT-X-ALLOWCACHE:%d\n", avio_printf(seg->list_pb, "#EXT-X-ALLOWCACHE:%d\n",
!!(seg->list_flags & SEGMENT_LIST_FLAG_CACHE)); !!(seg->list_flags & SEGMENT_LIST_FLAG_CACHE));
if (seg->list_flags & SEGMENT_LIST_FLAG_LIVE) if (seg->list_flags & SEGMENT_LIST_FLAG_LIVE)
@ -203,7 +202,6 @@ static void segment_list_close(AVFormatContext *s)
(int)ceil(seg->list_max_segment_time)); (int)ceil(seg->list_max_segment_time));
avio_printf(seg->list_pb, "#EXT-X-ENDLIST\n"); avio_printf(seg->list_pb, "#EXT-X-ENDLIST\n");
} }
seg->list_count++;
avio_close(seg->list_pb); avio_close(seg->list_pb);
} }