Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'

* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c':
  mpeg1: Make intra-block decoding independent of MpegEncContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 2423e21a41..3489d5d315 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -66,9 +66,14 @@ static int tqi_decode_mb(MpegEncContext *s, int16_t (*block)[64])
 {
     int n;
     s->bdsp.clear_blocks(block[0]);
-    for (n=0; n<6; n++)
-        if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0)
+    for (n = 0; n < 6; n++) {
+        int ret = ff_mpeg1_decode_block_intra(&s->gb,
+                                              s->intra_matrix,
+                                              s->intra_scantable.permutated,
+                                              s->last_dc, block[n], n, 1, s->block_last_index);
+        if (ret < 0)
             return -1;
+    }
 
     return 0;
 }