Commit 9266eb0c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 29d208d5 25ccf5df
......@@ -926,7 +926,7 @@ int av_write_trailer(AVFormatContext *s)
for (;; ) {
AVPacket pkt;
ret = interleave_packet(s, &pkt, NULL, 1);
if (ret < 0) //FIXME cleanup needed for ret<0 ?
if (ret < 0)
goto fail;
if (!ret)
break;
......@@ -943,10 +943,14 @@ int av_write_trailer(AVFormatContext *s)
goto fail;
}
fail:
if (s->oformat->write_trailer)
if (ret >= 0) {
ret = s->oformat->write_trailer(s);
} else {
s->oformat->write_trailer(s);
}
fail:
if (s->pb)
avio_flush(s->pb);
if (ret == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment