if (seg->list_size && seg->segment_count >= seg->list_size) {
entry = seg->segment_list_entries;
seg->segment_list_entries = seg->segment_list_entries->next;
- av_free(entry->filename);
+ av_freep(&entry->filename);
av_freep(&entry);
}
return 0;
}
-static void close_null_ctx(AVIOContext *pb)
+static void close_null_ctxp(AVIOContext **pb)
{
- av_free(pb->buffer);
- av_free(pb);
+ av_freep(&(*pb)->buffer);
+ av_freep(pb);
}
static int select_reference_stream(AVFormatContext *s)
s->avoid_negative_ts = 1;
if (!seg->write_header_trailer) {
- close_null_ctx(oc->pb);
+ close_null_ctxp(&oc->pb);
if ((ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL)) < 0)
goto fail;
goto fail;
open_null_ctx(&oc->pb);
ret = av_write_trailer(oc);
- close_null_ctx(oc->pb);
+ close_null_ctxp(&oc->pb);
} else {
ret = segment_end(s, 1, 1);
}
cur = seg->segment_list_entries;
while (cur) {
next = cur->next;
- av_free(cur->filename);
+ av_freep(&cur->filename);
av_free(cur);
cur = next;
}