diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-06-02 13:09:56 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-06-02 13:09:56 +0000 |
| commit | 21e305891c63b04ffcad1721eea8fe92f265f7f7 (patch) | |
| tree | 652660369b4bc052eae292c027bd0cb4397d61c2 /libavcodec/parser.c | |
| parent | cd6144948acc30cc489b389b975c7e2a7d57c280 (diff) | |
| download | ffmpeg-21e305891c63b04ffcad1721eea8fe92f265f7f7.tar.gz | |
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
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 4a908ac22c..2476093b57 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 */ |