avformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after...
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 22:55:38 +0000 (00:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 23:02:06 +0000 (01:02 +0200)
This fixes an infinite loop
An alternative fix would be to revert d73cbc22c5f2c305838d9867538cf4ad59c4035f
but that would worsen error resilience.

Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c

index c641794..2102bbe 100644 (file)
@@ -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;
             }