generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mux: Fix assertion failure due to max_interleave_delta and poor input

Browse Source 
Fixes Ticket4051

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-22 16:15:02 +02:00
parent ad5c43bb36
commit ec6a5fc6cc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mux.c
View File

@ -574,7 +574,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
if (pkt->pts != AV_NOPTS_VALUE) if (pkt->pts != AV_NOPTS_VALUE)
pkt->pts += offset; pkt->pts += offset;
av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0); av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0 || s->max_interleave_delta > 0);
if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
av_log(s, AV_LOG_WARNING,
"Packets poorly interleaved, failed to avoid negative timestamp %s in stream %d\n"
"try -max_interleave_delta 0 as a possible workaround\n",
av_ts2str(pkt->dts),
pkt->stream_index
);
}
} }
did_split = av_packet_split_side_data(pkt); did_split = av_packet_split_side_data(pkt);