aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-03 14:58:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-03 14:58:28 +0200
commit007ee09d7ccf9f331c58e8edc0a3d8bed58be10b (patch)
tree7abc8f17e084cf689463edcc3f50ad9622a98527 /ffmpeg.c
parent26b89f62740b2bf30bc7011af7ec0345e30761c7 (diff)
downloadffmpeg-007ee09d7ccf9f331c58e8edc0a3d8bed58be10b.tar.gz
ffmpeg: fix the used maximum dts in the monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2ad80ba1fe..8c9d848c47 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -625,10 +625,10 @@ 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",
- ost->last_mux_dts + 1);
- pkt->dts = ost->last_mux_dts + 1;
+ max);
+ pkt->dts = max;
if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts = FFMAX(pkt->pts, pkt->dts);
+ pkt->pts = FFMAX(pkt->pts, max);
}
}
ost->last_mux_dts = pkt->dts;