Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:25:37 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:57:07 +0000 (22:57 +0100)
* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f':
  filmstripdec: avoid integer overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/filmstripdec.c

index abc5f668e8a47f6d073c164834351723bc0a9283..155ded285695a4bb0a2ff0b4913ae01201b80f2a 100644 (file)
@@ -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;