Skip to content

F
ffmpeg
Commit e2fd18d4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

lavf: factor AVStream st out 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6b38101d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
libavformat/utils.c
View file @ e2fd18d4
...@@ -1383,6 +1383,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) ...@@ -1383,6 +1383,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
const int genpts = s->flags & AVFMT_FLAG_GENPTS; const int genpts = s->flags & AVFMT_FLAG_GENPTS;
int eof = 0; int eof = 0;
int ret; int ret;
AVStream *st;
if (!genpts) { if (!genpts) {
ret = s->packet_buffer ? read_from_packet_buffer(&s->packet_buffer, ret = s->packet_buffer ? read_from_packet_buffer(&s->packet_buffer,
...@@ -1452,11 +1453,12 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) ...@@ -1452,11 +1453,12 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
return_packet: 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); 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_WL32(p, st->skip_samples);
av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", s->streams[pkt->stream_index]->skip_samples); av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples);
s->streams[pkt->stream_index]->skip_samples = 0; st->skip_samples = 0;
} }
if (is_relative(pkt->dts)) if (is_relative(pkt->dts))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment