avcodec/hapdec: log reason for failure when texture type doesn't match stream
authorTom Butterworth <bangnoise@gmail.com>
Tue, 21 Jul 2015 00:12:11 +0000 (01:12 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 12:54:25 +0000 (14:54 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hapdec.c

index f55d4b7..8e90904 100644 (file)
@@ -79,8 +79,10 @@ static int setup_texture(AVCodecContext *avctx, size_t length)
 
     if ((avctx->codec_tag == MKTAG('H','a','p','1') && (ctx->section_type & 0x0F) != HAP_FMT_RGBDXT1)
         || (avctx->codec_tag == MKTAG('H','a','p','5') && (ctx->section_type & 0x0F) != HAP_FMT_RGBADXT5)
-        || (avctx->codec_tag == MKTAG('H','a','p','Y') && (ctx->section_type & 0x0F) != HAP_FMT_YCOCGDXT5))
+        || (avctx->codec_tag == MKTAG('H','a','p','Y') && (ctx->section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid texture format %#04x.\n", ctx->section_type & 0x0F);
         return AVERROR_INVALIDDATA;
+    }
 
     switch (ctx->section_type & 0xF0) {
     case HAP_COMP_NONE: