Add off argument so that fetch_timestamp can search for timestamps
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2008 13:09:56 +0000 (13:09 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2008 13:09:56 +0000 (13:09 +0000)
not associated with the first byte of access units.

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

libavcodec/parser.c

index 4a908ac..2476093 100644 (file)
@@ -76,14 +76,14 @@ AVCodecParserContext *av_parser_init(int codec_id)
     return s;
 }
 
     return s;
 }
 
-void ff_fetch_timestamp(AVCodecParserContext *s){
+void ff_fetch_timestamp(AVCodecParserContext *s, int off){
     int i;
     s->dts= s->pts= AV_NOPTS_VALUE;
     s->offset= 0;
     for(i = 0; i < AV_PARSER_PTS_NB; i++) {
     int i;
     s->dts= s->pts= AV_NOPTS_VALUE;
     s->offset= 0;
     for(i = 0; i < AV_PARSER_PTS_NB; i++) {
-        if (   s->next_frame_offset >= s->cur_frame_offset[i]
+        if (   s->next_frame_offset + off >= s->cur_frame_offset[i]
             &&(s->     frame_offset <  s->cur_frame_offset[i] || !s->frame_offset)
             &&(s->     frame_offset <  s->cur_frame_offset[i] || !s->frame_offset)
-            && s->next_frame_offset <  s->cur_frame_end[i]){
+            && s->next_frame_offset + off <  s->cur_frame_end[i]){
             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];
             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];
@@ -142,7 +142,7 @@ int av_parser_parse(AVCodecParserContext *s,
         s->fetch_timestamp=0;
         s->last_pts = s->pts;
         s->last_dts = s->dts;
         s->fetch_timestamp=0;
         s->last_pts = s->pts;
         s->last_dts = s->dts;
-        ff_fetch_timestamp(s);
+        ff_fetch_timestamp(s, 0);
     }
 
     /* WARNING: the returned index can be negative */
     }
 
     /* WARNING: the returned index can be negative */