Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-03 17:00:21 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-05-03 17:00:21 +0400
commit30c05f6b02a4806249e566674b88a5925e4796c4 (patch)
tree1f8dbf41d2b92f4a4ceaad43980d08da0394bd0a /ffmpeg.c
parent007ee09d7ccf9f331c58e8edc0a3d8bed58be10b (diff)
ffmpeg: fix pts handling in the non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 8c9d848c47..88da0d7b0e 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;