Module: libav
Branch: master
Commit: 0348e74c01a099a3787ae21df1c2a742fc846163

Author:    Vittorio Giovara <[email protected]>
Committer: Vittorio Giovara <[email protected]>
Date:      Mon May 11 20:11:04 2015 +0100

quickdraw: Skip the empty 512 byte header for images

Found-by: Carl Eugen Hoyos <[email protected]>

---

 libavcodec/qdrw.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index f7a4377..477175c 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -125,6 +125,10 @@ static int decode_frame(AVCodecContext *avctx,
 
     bytestream2_init(&gbc, avpkt->data, avpkt->size);
 
+    /* PICT images start with a 512 bytes empty header */
+    if (bytestream2_peek_be32(&gbc) == 0)
+        bytestream2_skip(&gbc, 512);
+
     /* smallest PICT header */
     if (bytestream2_get_bytes_left(&gbc) < 40) {
         av_log(avctx, AV_LOG_ERROR, "Frame is too small %d\n",

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to