# HG changeset patch # User michael # Date 1212376200 0 # Node ID 4257fdcf664ec30d9773b952cde447da3d6c6e05 # Parent 9774d160f0148362c9de201bf807dcf92e256662 Rename last_frame_offset to next_frame_offset. (it was and is the next not the last) diff -r 9774d160f014 -r 4257fdcf664e avcodec.h --- a/avcodec.h Mon Jun 02 03:07:32 2008 +0000 +++ b/avcodec.h Mon Jun 02 03:10:00 2008 +0000 @@ -2822,7 +2822,7 @@ int64_t frame_offset; /* offset of the current frame */ int64_t cur_offset; /* current offset (incremented by each av_parser_parse()) */ - int64_t last_frame_offset; /* offset of the last frame */ + int64_t next_frame_offset; /* offset of the next frame */ /* video info */ int pict_type; /* XXX: Put it back in AVCodecContext. */ int repeat_pict; /* XXX: Put it back in AVCodecContext. */ diff -r 9774d160f014 -r 4257fdcf664e parser.c --- a/parser.c Mon Jun 02 03:07:32 2008 +0000 +++ b/parser.c Mon Jun 02 03:10:00 2008 +0000 @@ -130,12 +130,12 @@ s->dts= s->pts= AV_NOPTS_VALUE; s->offset= 0; for(i = 0; i < AV_PARSER_PTS_NB; i++) { - if ( s->last_frame_offset >= s->cur_frame_offset[i] + if ( s->next_frame_offset >= s->cur_frame_offset[i] &&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset) - && s->last_frame_offset < s->cur_frame_end[i]){ + && s->next_frame_offset < s->cur_frame_end[i]){ s->dts= s->cur_frame_dts[i]; s->pts= s->cur_frame_pts[i]; - s->offset = s->last_frame_offset - s->cur_frame_offset[i]; + s->offset = s->next_frame_offset - s->cur_frame_offset[i]; } } } @@ -146,10 +146,10 @@ /* update the file pointer */ if (*poutbuf_size) { /* fill the data for the current frame */ - s->frame_offset = s->last_frame_offset; + s->frame_offset = s->next_frame_offset; /* offset of the next frame */ - s->last_frame_offset = s->cur_offset + index; + s->next_frame_offset = s->cur_offset + index; s->fetch_timestamp=1; } if (index < 0)