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

2017-12-12 Thread James Almer 
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 
>> ---
>>  libavformat/mux.c | 24 
>>  1 file changed, 8 insertions(+), 16 deletions(-)
> 
> LGTM
> 
> thx

Pushed.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-12-12 Thread Michael Niedermayer 
On Mon, Dec 11, 2017 at 01:04:41AM -0300, James Almer wrote:
> Signed-off-by: James Almer 
> ---
>  libavformat/mux.c | 24 
>  1 file changed, 8 insertions(+), 16 deletions(-)

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-12-10 Thread James Almer 
Signed-off-by: James Almer 
---
 libavformat/mux.c | 24 
 1 file 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;
-- 
2.15.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel