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/vp8data.h | |
| 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/vp8data.h')
| -rw-r--r-- | libavcodec/vp8data.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index f9dbf56feb..5e6dea7617 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -708,14 +708,6 @@ static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS - 1] = { }, }; -// fixme: copied from h264data.h -static const uint8_t zigzag_scan[16]={ - 0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4, - 1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4, - 1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4, - 3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4, -}; - static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT + 1] = { 4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 17, 18, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, 27, 28, |