RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename last_frame_offset to next_frame_offset. 

(it was and is the next not the last)

Originally committed as revision 13615 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-06-02 03:10:00 +00:00
parent 556eec43ef
commit 26f237254d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -2822,7 +2822,7 @@ typedef struct AVCodecParserContext {
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. */

10
libavcodec/parser.c
View File

@ -130,12 +130,12 @@ int av_parser_parse(AVCodecParserContext *s,
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 @@ int av_parser_parse(AVCodecParserContext *s,
/* 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)