diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:47:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:47:39 +0100 |
| commit | a5a6621616aac55b8284002af4fef35b66e2b2d1 (patch) | |
| tree | e162517aeeef766d788a645d362e089221681234 /libavcodec/tscc2.c | |
| parent | 2e67a99fbc6b99315925de40fc6fa7161576be10 (diff) | |
| parent | f4d581cda3897f66c1dda7586b93f86a591dbbef (diff) | |
| download | ffmpeg-a5a6621616aac55b8284002af4fef35b66e2b2d1.tar.gz | |
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/tscc2.c')
| -rw-r--r-- | libavcodec/tscc2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index 9bb7ab3ba3..69a6facaf2 100644 --- 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); } |