diff mbox

[FFmpeg-devel] avformat/mux: factorize AVFormatContext->avoid_negative_ts initialization

Message ID 20171211040441.9676-1-jamrial@gmail.com
State Accepted
Commit 0e2fbd68e2796e7ed3cc7b327cd03908802045c1
Headers show

Commit Message

James Almer Dec. 11, 2017, 4:04 a.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/mux.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

Comments

Michael Niedermayer Dec. 12, 2017, 7:30 p.m. UTC | #1 
On Mon, Dec 11, 2017 at 01:04:41AM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/mux.c | 24 ++++++++----------------
>  1 file changed, 8 insertions(+), 16 deletions(-)

LGTM

thx

[...]
James Almer Dec. 12, 2017, 11:24 p.m. UTC | #2 
On 12/12/2017 4:30 PM, Michael Niedermayer wrote:
> On Mon, Dec 11, 2017 at 01:04:41AM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavformat/mux.c | 24 ++++++++----------------
>>  1 file changed, 8 insertions(+), 16 deletions(-)
> 
> LGTM
> 
> thx

Pushed.
diff mbox

Patch

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;