aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-03 14:54:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-03 14:55:20 +0200
commit6b2fbdb047dac1e3a6c6281226df2b76a3896dad (patch)
tree3eda544e6302b49d38a0681882ca1ccb96fca3c9 /ffmpeg.c
parentee3824f6f6968a3917ba7ed1906d00f6e2df258e (diff)
downloadffmpeg-6b2fbdb047dac1e3a6c6281226df2b76a3896dad.tar.gz
ffmpeg: Check dts before use in non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index b890580feb..0e0d85d737 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -612,6 +612,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
(avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) &&
+ pkt->dts != AV_NOPTS_VALUE &&
ost->last_mux_dts != AV_NOPTS_VALUE &&
pkt->dts < ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT)) {
av_log(NULL, AV_LOG_WARNING, "Non-monotonous DTS in output stream "