git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d0dce15
)
quickdraw: Skip the empty 512 byte header for images
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 11 May 2015 19:11:04 +0000
(20:11 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 12 May 2015 14:28:31 +0000
(15:28 +0100)
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
libavcodec/qdrw.c
patch
|
blob
|
history
diff --git
a/libavcodec/qdrw.c
b/libavcodec/qdrw.c
index
f7a4377
..
477175c
100644
(file)
--- 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",