virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '0348e74c01a099a3787ae21df1c2a742fc846163'

Browse Source 
* commit '0348e74c01a099a3787ae21df1c2a742fc846163':
  quickdraw: Skip the empty 512 byte header for images

See: b453e76842
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-13 20:47:20 +02:00
parent 5d9873ecda 0348e74c01
commit b6e8166a48
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/qdrw.c
View File

@@ -129,6 +129,10 @@ static int decode_frame(AVCodecContext *avctx,
&& AV_RB32(&avpkt->data[522]) == 0x001102FF) && AV_RB32(&avpkt->data[522]) == 0x001102FF)
bytestream2_skip(&gbc, 512); 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 */ /* smallest PICT header */
if (bytestream2_get_bytes_left(&gbc) < 40) { if (bytestream2_get_bytes_left(&gbc) < 40) {
av_log(avctx, AV_LOG_ERROR, "Frame is too small %d\n", av_log(avctx, AV_LOG_ERROR, "Frame is too small %d\n",