ffmpeg | branch: master | Vittorio Giovara <[email protected]> | Fri Jul 10 15:52:00 2015 +0100| [0cf5588d69922aa3e063bac6304c09c543a9ef52] | committer: Vittorio Giovara
hq_hqa: Fix decoding when INFO section is absent > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cf5588d69922aa3e063bac6304c09c543a9ef52 --- libavcodec/hq_hqa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index ae378e6..4871c59 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -310,9 +310,11 @@ static int hq_hqa_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - info_tag = bytestream2_get_le32(&ctx->gbc); + info_tag = bytestream2_peek_le32(&ctx->gbc); if (info_tag == MKTAG('I', 'N', 'F', 'O')) { - int info_size = bytestream2_get_le32(&ctx->gbc); + int info_size; + bytestream2_skip(&ctx->gbc, 4); + info_size = bytestream2_get_le32(&ctx->gbc); if (bytestream2_get_bytes_left(&ctx->gbc) < info_size) { av_log(avctx, AV_LOG_ERROR, "Invalid INFO size (%d).\n", info_size); return AVERROR_INVALIDDATA; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
