X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsmacker.c;h=0138af3d1405ef6415458b5fbeb0a3b64280df19;hb=6e5dbd62681c2059bb7047f0b42d33fdf5a9d40d;hp=4990b7d920f5b869f25519f78a530058288dbf64;hpb=316dc0674eeb3419e560913ac9bc130b6dae919a;p=ffmpeg diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 4990b7d920f..0138af3d140 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -58,7 +58,6 @@ typedef struct SmackerContext { uint8_t pal[768]; int indexes[7]; int videoindex; - int curstream; int64_t aud_pts[7]; } SmackerContext; @@ -247,7 +246,6 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) if (!smk->next_audio_index) { smk->frame_size = smk->frm_size[smk->cur_frame] & (~3); smk->next_frame_pos = avio_tell(s->pb) + smk->frame_size; - smk->curstream = 0; flags = smk->frm_flags[smk->cur_frame]; smk->flags = flags >> 1; /* handle palette change event */ @@ -323,10 +321,9 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) goto next_frame; } pkt->stream_index = smk->indexes[i]; - pkt->pts = smk->aud_pts[smk->curstream]; - smk->aud_pts[smk->curstream] += AV_RL32(pkt->data); + pkt->pts = smk->aud_pts[i]; + smk->aud_pts[i] += AV_RL32(pkt->data); smk->next_audio_index = i + 1; - smk->curstream++; return 0; } }