Browse Source

avformat/mpegtsenc: move around setting m2ts_mode

Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n4.3
Marton Balint 6 years ago
parent
commit
db63db3977
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      libavformat/mpegtsenc.c

+ 8
- 8
libavformat/mpegtsenc.c View 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:


Loading…
Cancel
Save