Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'

* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431':
  hq_hqa: Fix reading hqa quantization matrix index

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index d0f23ad006f048c17d70063822c405f7ccaaba05..b2b2c3dbc6dceae12eb975b34c79fa4ed11d37cc 100644 (file)
--- 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);