Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'

[ffmpeg] / libavcodec / tscc2.c

diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c
index 9bb7ab3ba389cb13276f3f643d727966553be3c0..69a6facaf26fd0cfb01d63c29443029865baa80e 100644 (file)
--- a/libavcodec/tscc2.c
+++ b/libavcodec/tscc2.c
@@ -31,6 +31,7 @@
 #include "get_bits.h"
 #include "bytestream.h"
 #include "internal.h"
+#include "mathops.h"
 #include "tscc2data.h"
 
 typedef struct TSCC2Context {
@@ -179,7 +180,7 @@ static int tscc2_decode_mb(TSCC2Context *c, int *q, int vlc_set,
                 if (bpos >= 16)
                     return AVERROR_INVALIDDATA;
                 val = sign_extend(ac >> 4, 8);
-                c->block[tscc2_zigzag[bpos++]] = val;
+                c->block[ff_zigzag_scan[bpos++]] = val;
             }
             tscc2_idct4_put(c->block, q, dst + k * 4, stride);
         }