virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavf/segment: drop now pointless segment_list_close() function

Browse Source
This commit is contained in:
Stefano Sabatini 2013-01-23 18:19:42 +01:00
parent ca68acd7ac
commit f4e4e5b841
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/segment.c
View File

@ -230,12 +230,6 @@ static int segment_list_open(AVFormatContext *s)
return ret; return ret;
} }
static void segment_list_close(AVFormatContext *s)
{
SegmentContext *seg = s->priv_data;
avio_close(seg->list_pb);
}
static void segment_list_print_entry(AVIOContext *list_ioctx, static void segment_list_print_entry(AVIOContext *list_ioctx,
ListType list_type, ListType list_type,
const SegmentListEntry *list_entry) const SegmentListEntry *list_entry)
@ -295,7 +289,7 @@ static int segment_end(AVFormatContext *s, int write_trailer, int is_last)
av_freep(&entry); av_freep(&entry);
} }
segment_list_close(s); avio_close(seg->list_pb);
if ((ret = segment_list_open(s)) < 0) if ((ret = segment_list_open(s)) < 0)
goto end; goto end;
for (entry = seg->segment_list_entries; entry; entry = entry->next) for (entry = seg->segment_list_entries; entry; entry = entry->next)
@ -627,7 +621,7 @@ static int seg_write_header(AVFormatContext *s)
fail: fail:
if (ret) { if (ret) {
if (seg->list) if (seg->list)
segment_list_close(s); avio_close(seg->list_pb);
if (seg->avf) if (seg->avf)
avformat_free_context(seg->avf); avformat_free_context(seg->avf);
} }
@ -739,7 +733,7 @@ static int seg_write_trailer(struct AVFormatContext *s)
} }
fail: fail:
if (seg->list) if (seg->list)
segment_list_close(s); avio_close(seg->list_pb);
av_opt_free(seg); av_opt_free(seg);
av_freep(&seg->times); av_freep(&seg->times);