Commit a6609919 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after the given position

This fixes an infinite loop
An alternative fix would be to revert d73cbc22
but that would worsen error resilience.

Found-by: Justin Ruggles
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b78e75eb
......@@ -2362,7 +2362,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index,
if(pkt.dts != AV_NOPTS_VALUE && pkt.pos >= 0){
ff_reduce_index(s, pkt.stream_index);
av_add_index_entry(s->streams[pkt.stream_index], pkt.pos, pkt.dts, 0, 0, AVINDEX_KEYFRAME /* FIXME keyframe? */);
if(pkt.stream_index == stream_index){
if(pkt.stream_index == stream_index && pkt.pos >= *ppos){
*ppos= pkt.pos;
return pkt.dts;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment