From: James Almer Date: Mon, 11 Dec 2017 04:02:30 +0000 (-0300) Subject: avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization X-Git-Tag: n4.0~1175 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=0e2fbd68e2796e7ed3cc7b327cd03908802045c1;ds=inline avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization Reviewed-by: Michael Niedermayer Signed-off-by: James Almer --- diff --git a/libavformat/mux.c b/libavformat/mux.c index effcc1152f..ea9f13fdf5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -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; } @@ -472,14 +480,6 @@ int avformat_init_output(AVFormatContext *s, AVDictionary **options) if ((ret = init_pts(s)) < 0) 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; } @@ -512,14 +512,6 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) if (!s->internal->streams_initialized) { if ((ret = init_pts(s)) < 0) 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;