From 26f237254d56232a492054ac66d79c642d2df98b Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 2 Jun 2008 03:10:00 +0000
Subject: [PATCH] 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
---
libavcodec/avcodec.h | 2 +-
libavcodec/parser.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b14c1a940c1..87d344cb9f1 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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. */
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index e5a4b350611..00356b10e56 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -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)
--
GitLab