Allow matching timestamps to be removed by fetch_timestamp().

Originally committed as revision 13623 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 2476093b57f469e77b06dae97366ee1bf07ee678..0bc9091fe3371f778881af8b10059b526015abf0 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -76,7 +76,7 @@ AVCodecParserContext *av_parser_init(int codec_id)
     return s;
 }
 
-void ff_fetch_timestamp(AVCodecParserContext *s, int off){
+void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
     int i;
     s->dts= s->pts= AV_NOPTS_VALUE;
     s->offset= 0;
@@ -87,6 +87,8 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off){
             s->dts= s->cur_frame_dts[i];
             s->pts= s->cur_frame_pts[i];
             s->offset = s->next_frame_offset - s->cur_frame_offset[i];
+            if(remove)
+                s->cur_frame_offset[i]= INT64_MAX;
         }
     }
 }
@@ -142,7 +144,7 @@ int av_parser_parse(AVCodecParserContext *s,
         s->fetch_timestamp=0;
         s->last_pts = s->pts;
         s->last_dts = s->dts;
-        ff_fetch_timestamp(s, 0);
+        ff_fetch_timestamp(s, 0, 0);
     }
 
     /* WARNING: the returned index can be negative */