From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 2 Jun 2008 13:12:54 +0000 (+0000)
Subject: Allow matching timestamps to be removed by fetch_timestamp().
X-Git-Tag: v0.5~4298
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/ec0c5d482e6f0cc8c94980494cf6bad39419302c

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 2476093..0bc9091 100644
--- 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 */