Merge remote-tracking branch 'qatar/master'

[ffmpeg.git] / libavformat / segment.c

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 05f76a7..09949d7 100644 (file)
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -113,10 +113,15 @@ static int seg_write_header(AVFormatContext *s)
     seg->offset_time = 0;
     seg->recording_time = seg->time * 1000000;
 
     seg->offset_time = 0;
     seg->recording_time = seg->time * 1000000;
 

+    oc = avformat_alloc_context();
+
+    if (!oc)
+        return AVERROR(ENOMEM);
+

     if (seg->list)
         if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE,
                               &s->interrupt_callback, NULL)) < 0)
     if (seg->list)
         if ((ret = avio_open2(&seg->pb, seg->list, AVIO_FLAG_WRITE,
                               &s->interrupt_callback, NULL)) < 0)

-            return ret;
+            goto fail;

 
     for (i = 0; i< s->nb_streams; i++)
         seg->has_video +=
 
     for (i = 0; i< s->nb_streams; i++)
         seg->has_video +=


@@ -127,13 +132,6 @@ static int seg_write_header(AVFormatContext *s)
                "More than a single video stream present, "
                "expect issues decoding it.\n");
 
                "More than a single video stream present, "
                "expect issues decoding it.\n");
 

-    oc = avformat_alloc_context();
-
-    if (!oc) {
-        ret = AVERROR(ENOMEM);
-        goto fail;
-    }
-

     oc->oformat = av_guess_format(seg->format, s->filename, NULL);
 
     if (!oc->oformat) {
     oc->oformat = av_guess_format(seg->format, s->filename, NULL);
 
     if (!oc->oformat) {