Browse Source

avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
tags/n4.0
James Almer 8 years ago
parent
commit
0e2fbd68e2
1 changed files with 8 additions and 16 deletions
  1. +8
    -16
      libavformat/mux.c

+ 8
- 16
libavformat/mux.c View File

@@ -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;


Loading…
Cancel
Save