[FFmpeg-devel] [PATCH]Do not fail for valid PICT files

[Carl Eugen Hoyos]

Hi!

Attached patch fixes reading valid pict files with non-zero user data.
https://developer.apple.com/legacy/library/documentation/mac/QuickDraw/QuickDraw-334.html

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 1c3244b..6ec35c6 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -124,9 +124,8 @@ static int decode_frame(AVCodecContext *avctx,
     int w, h, ret;
 
     bytestream2_init(&gbc, avpkt->data, avpkt->size);
-    while (   bytestream2_get_bytes_left(&gbc) >= 552
-           && (   !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+6])
-               || !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+8])))
+    if (   bytestream2_get_bytes_left(&gbc) >= 552
+           && AV_RB32(&avpkt->data[522]) == 0x001102FF)
         bytestream2_skip(&gbc, 512);
 
     /* smallest PICT header */