[FFmpeg-cvslog] avcodec/hapdec: log reason for failure when texture type doesn' t match stream
Tom Butterworth
git at videolan.org
Tue Jul 21 15:13:33 CEST 2015
ffmpeg | branch: master | Tom Butterworth <bangnoise at gmail.com> | Tue Jul 21 01:12:11 2015 +0100| [5d0616ce0e640383904615f1d09cae21446124bb] | committer: Michael Niedermayer
avcodec/hapdec: log reason for failure when texture type doesn't match stream
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d0616ce0e640383904615f1d09cae21446124bb
---
libavcodec/hapdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index f55d4b7..8e90904 100644
--- a/libavcodec/hapdec.c
+++ b/libavcodec/hapdec.c
@@ -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:
More information about the ffmpeg-cvslog
mailing list