aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hq_hqa.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 23:20:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-20 23:20:36 +0200
commit1a41415b2adcc38d1de4b10ed2f97c2db2036c08 (patch)
tree13588f07ffa9c928d468ed442598809552655471 /libavcodec/hq_hqa.c
parent2f8f5027ad6f16969b284b1a22f77302f8fc429e (diff)
parentbd5ad8b23d0f7d469ca30d03deca879993eb0431 (diff)
downloadffmpeg-1a41415b2adcc38d1de4b10ed2f97c2db2036c08.tar.gz
Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'
* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431': hq_hqa: Fix reading hqa quantization matrix index Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hq_hqa.c')
-rw-r--r--libavcodec/hq_hqa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index d0f23ad006..b2b2c3dbc6 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -255,7 +255,8 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame *pic, size_t data_size)
av_log(ctx->avctx, AV_LOG_VERBOSE, "HQA Profile\n");
- quant = bytestream2_get_be32(&ctx->gbc);
+ quant = bytestream2_get_byte(&ctx->gbc);
+ bytestream2_skip(&ctx->gbc, 3);
if (quant >= NUM_HQ_QUANTS) {
av_log(ctx->avctx, AV_LOG_ERROR,
"Invalid quantization matrix %d.\n", quant);