From: Michael Niedermayer Date: Mon, 2 Jun 2008 13:09:56 +0000 (+0000) Subject: Add off argument so that fetch_timestamp can search for timestamps X-Git-Tag: v0.5~4299 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=21e305891c63b04ffcad1721eea8fe92f265f7f7;p=coroid%2Flibav_saccubus.git Add off argument so that fetch_timestamp can search for timestamps not associated with the first byte of access units. Originally committed as revision 13622 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 4a908ac22..2476093b5 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -76,14 +76,14 @@ AVCodecParserContext *av_parser_init(int codec_id) 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++) { - 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->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]; @@ -142,7 +142,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); + ff_fetch_timestamp(s, 0); } /* WARNING: the returned index can be negative */