avformat/mpegtsenc: move around setting m2ts_mode
authorMarton Balint <cus@passwd.hu>
Sun, 10 Nov 2019 21:14:30 +0000 (22:14 +0100)
committerMarton Balint <cus@passwd.hu>
Tue, 3 Dec 2019 10:00:11 +0000 (11:00 +0100)
Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/mpegtsenc.c

index 92c7820..b976880 100644 (file)
@@ -850,6 +850,14 @@ static int mpegts_init(AVFormatContext *s)
     int *pids;
     int ret;
 
+    if (ts->m2ts_mode == -1) {
+        if (av_match_ext(s->url, "m2ts")) {
+            ts->m2ts_mode = 1;
+        } else {
+            ts->m2ts_mode = 0;
+        }
+    }
+
     if (s->max_delay < 0) /* Not set by the caller */
         s->max_delay = 0;
 
@@ -1002,14 +1010,6 @@ static int mpegts_init(AVFormatContext *s)
            av_rescale(ts->sdt_period, 1000, PCR_TIME_BASE),
            av_rescale(ts->pat_period, 1000, PCR_TIME_BASE));
 
-    if (ts->m2ts_mode == -1) {
-        if (av_match_ext(s->url, "m2ts")) {
-            ts->m2ts_mode = 1;
-        } else {
-            ts->m2ts_mode = 0;
-        }
-    }
-
     return 0;
 
 fail: