aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-05 18:37:32 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-06-09 23:46:48 +0200
commit8c33d40a7b8a44f550a1fb11a082a95aaa606284 (patch)
tree8f9182d52e65716eadb48b6f16c784ed6c786bdf
parentf406bf3fa933be089bd76a95f75ea57b0942f8c5 (diff)
downloadffmpeg-8c33d40a7b8a44f550a1fb11a082a95aaa606284.tar.gz
ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy
Fixes Ticket3658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 27856b2fe9cdbcf48ad996647cb104667b373fa4)
-rw-r--r--ffmpeg.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5caac1f36f..5463f06207 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -621,7 +621,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
bsfc = bsfc->next;
}
- if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
+ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
+ if(
(avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) &&
pkt->dts != AV_NOPTS_VALUE &&
ost->last_mux_dts != AV_NOPTS_VALUE) {
@@ -642,6 +643,16 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
pkt->pts = FFMAX(pkt->pts, max);
pkt->dts = max;
}
+ }
+ if (pkt->dts != AV_NOPTS_VALUE &&
+ pkt->pts != AV_NOPTS_VALUE &&
+ pkt->dts > pkt->pts) {
+ av_log(s, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64" in output stream %d:%d\n",
+ pkt->dts, pkt->pts,
+ ost->file_index, ost->st->index);
+ pkt->pts = AV_NOPTS_VALUE;
+ pkt->dts = AV_NOPTS_VALUE;
+ }
}
ost->last_mux_dts = pkt->dts;