Merge commit '5a79bf0284a37855636390e620d189a964214c9e'

[ffmpeg] / libavformat / segment.c

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 4418d0f3381472d1295f843ac5fd1e6e902c77b2..42471bb19063f6f03380d32fa0cc2be99af6aa4f 100644 (file)
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -860,7 +860,8 @@ static int seg_write_trailer(struct AVFormatContext *s)
     if (!seg->write_header_trailer) {
         if ((ret = segment_end(s, 0, 1)) < 0)
             goto fail;
-        open_null_ctx(&oc->pb);
+        if ((ret = open_null_ctx(&oc->pb)) < 0)
+            goto fail;
         ret = av_write_trailer(oc);
         close_null_ctxp(&oc->pb);
     } else {