mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f': filmstripdec: avoid integer overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
76b9043e90
@ -84,7 +84,7 @@ static int read_packet(AVFormatContext *s,
|
||||
return AVERROR(EIO);
|
||||
pkt->dts = avio_tell(s->pb) / (st->codec->width * (st->codec->height + film->leading) * 4);
|
||||
pkt->size = av_get_packet(s->pb, pkt, st->codec->width * st->codec->height * 4);
|
||||
avio_skip(s->pb, st->codec->width * film->leading * 4);
|
||||
avio_skip(s->pb, st->codec->width * (int64_t) film->leading * 4);
|
||||
if (pkt->size < 0)
|
||||
return pkt->size;
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
|
Loading…
Reference in New Issue
Block a user