From e2fd18d40d998b84af49079aa4cbd9fe9aeb4d88 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 24 Jul 2012 17:33:15 +0200 Subject: [PATCH] lavf: factor AVStream st out Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index e348fbde5a..4dde821bcf 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1383,6 +1383,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) const int genpts = s->flags & AVFMT_FLAG_GENPTS; int eof = 0; int ret; + AVStream *st; if (!genpts) { ret = s->packet_buffer ? read_from_packet_buffer(&s->packet_buffer, @@ -1452,11 +1453,12 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) return_packet: - if(s->streams[pkt->stream_index]->skip_samples) { + st = s->streams[pkt->stream_index]; + if (st->skip_samples) { uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10); - AV_WL32(p, s->streams[pkt->stream_index]->skip_samples); - av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", s->streams[pkt->stream_index]->skip_samples); - s->streams[pkt->stream_index]->skip_samples = 0; + AV_WL32(p, st->skip_samples); + av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples); + st->skip_samples = 0; } if (is_relative(pkt->dts))