From b453e768427969b170820e8e8fe51c84856563b2 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 7 May 2015 00:51:28 +0200 Subject: [PATCH] lavc/qdrw: Also support real-world qdraw images. --- libavcodec/qdrw.c | 4 ++++ libavcodec/version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index b650ade343..b7a7cf5f1d 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -124,6 +124,10 @@ static int decode_frame(AVCodecContext *avctx, int w, h, ret; bytestream2_init(&gbc, avpkt->data, avpkt->size); + if ( avpkt->size >= 552 + && AV_RB32(&avpkt->data[ 10]) != 0x001102FF + && AV_RB32(&avpkt->data[522]) == 0x001102FF) + bytestream2_skip(&gbc, 512); /* smallest PICT header */ if (bytestream2_get_bytes_left(&gbc) < 40) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 3f06f85cb9..e4a7f753c4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 37 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \