mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
a0e4c41d08
commit
0e2fbd68e2
|
@ -445,6 +445,14 @@ static int init_pts(AVFormatContext *s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (s->avoid_negative_ts < 0) {
|
||||||
|
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
|
||||||
|
if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) {
|
||||||
|
s->avoid_negative_ts = 0;
|
||||||
|
} else
|
||||||
|
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -472,14 +480,6 @@ int avformat_init_output(AVFormatContext *s, AVDictionary **options)
|
||||||
if ((ret = init_pts(s)) < 0)
|
if ((ret = init_pts(s)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (s->avoid_negative_ts < 0) {
|
|
||||||
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
|
|
||||||
if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) {
|
|
||||||
s->avoid_negative_ts = 0;
|
|
||||||
} else
|
|
||||||
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return AVSTREAM_INIT_IN_INIT_OUTPUT;
|
return AVSTREAM_INIT_IN_INIT_OUTPUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -512,14 +512,6 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
|
||||||
if (!s->internal->streams_initialized) {
|
if (!s->internal->streams_initialized) {
|
||||||
if ((ret = init_pts(s)) < 0)
|
if ((ret = init_pts(s)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if (s->avoid_negative_ts < 0) {
|
|
||||||
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
|
|
||||||
if (s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) {
|
|
||||||
s->avoid_negative_ts = 0;
|
|
||||||
} else
|
|
||||||
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return streams_already_initialized;
|
return streams_already_initialized;
|
||||||
|
|
Loading…
Reference in New Issue