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/h264data.h | |
| parent | 2e67a99fbc6b99315925de40fc6fa7161576be10 (diff) | |
| parent | f4d581cda3897f66c1dda7586b93f86a591dbbef (diff) | |
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264data.h')
| -rw-r--r-- | libavcodec/h264data.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 95ea385deb..a6c69e55d3 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -51,13 +51,6 @@ static const uint8_t golomb_to_inter_cbp[48] = { 17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41 }; -static const uint8_t zigzag_scan[16+1] = { - 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 chroma_dc_scan[4] = { (0 + 0 * 2) * 16, (1 + 0 * 2) * 16, (0 + 1 * 2) * 16, (1 + 1 * 2) * 16, |