diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 20:47:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 21:13:52 +0200 |
| commit | b6e8166a489d4c681e8a56483b9506d4f27e9ad0 (patch) | |
| tree | 2d8b7cc2b118e109e1d0f8a539c1d4b508e86db9 /libavcodec/qdrw.c | |
| parent | 5d9873ecdab8d07c4f928d604a819756bb540e4b (diff) | |
| parent | 0348e74c01a099a3787ae21df1c2a742fc846163 (diff) | |
| download | ffmpeg-b6e8166a489d4c681e8a56483b9506d4f27e9ad0.tar.gz | |
Merge commit '0348e74c01a099a3787ae21df1c2a742fc846163'
* commit '0348e74c01a099a3787ae21df1c2a742fc846163':
quickdraw: Skip the empty 512 byte header for images
See: b453e768427969b170820e8e8fe51c84856563b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qdrw.c')
| -rw-r--r-- | libavcodec/qdrw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index ffc9ffde71..8260395c88 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -129,6 +129,10 @@ static int decode_frame(AVCodecContext *avctx, && AV_RB32(&avpkt->data[522]) == 0x001102FF) bytestream2_skip(&gbc, 512); + /* 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", |