lavc/qdrw: Also support real-world qdraw images.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 6 May 2015 22:51:28 +0000 (00:51 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 6 May 2015 23:21:08 +0000 (01:21 +0200)
libavcodec/qdrw.c
libavcodec/version.h

index b650ade..b7a7cf5 100644 (file)
@@ -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) {
index 3f06f85..e4a7f75 100644 (file)
@@ -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, \