From 30c05f6b02a4806249e566674b88a5925e4796c4 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 3 May 2013 15:00:21 +0200
Subject: [PATCH] ffmpeg: fix pts handling in the non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffmpeg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 8c9d848c475..88da0d7b0ee 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -626,9 +626,9 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result "
"in incorrect timestamps in the output file.\n",
max);
- pkt->dts = max;
- if (pkt->pts != AV_NOPTS_VALUE)
+ if(pkt->pts >= pkt->dts)
pkt->pts = FFMAX(pkt->pts, max);
+ pkt->dts = max;
}
}
ost->last_mux_dts = pkt->dts;
--
GitLab