avcodec/dpx: check encoding
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 23:38:08 +0000 (01:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 23:41:44 +0000 (01:41 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dpx.c

index 59845c7..9609a52 100644 (file)
@@ -78,6 +78,7 @@ static int decode_frame(AVCodecContext *avctx,
     int magic_num, endian;
     int x, y, i, ret;
     int w, h, bits_per_color, descriptor, elements, packing, total_size;
+    int encoding;
 
     unsigned int rgbBuffer = 0;
     int n_datum = 0;
@@ -126,8 +127,15 @@ static int decode_frame(AVCodecContext *avctx,
     bits_per_color = buf[0];
     buf++;
     packing = read16(&buf, endian);
+    encoding = read16(&buf, endian);
 
-    buf += 822;
+    if (encoding) {
+        avpriv_report_missing_feature(avctx,
+                                      "Unsupported encoding %d\n", encoding);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    buf += 820;
     avctx->sample_aspect_ratio.num = read32(&buf, endian);
     avctx->sample_aspect_ratio.den = read32(&buf, endian);
     if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0)