diff options
| author | James Almer <jamrial@gmail.com> | 2017-12-11 01:02:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-12 20:18:29 -0300 |
| commit | 0e2fbd68e2796e7ed3cc7b327cd03908802045c1 (patch) | |
| tree | e768245d38396223ff4f110750ba2fec86ecaaec | |
| parent | a0e4c41d086bbc32dfefef0b81ed0f59fe04d4ab (diff) | |
| download | ffmpeg-0e2fbd68e2796e7ed3cc7b327cd03908802045c1.tar.gz | |
avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/mux.c | 24 |
1 files changed, 8 insertions, 16 deletions
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; |