diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:21:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:21:48 +0200 |
| commit | 16466d92b9f795579d4020b1c7cb3ad7750cc182 (patch) | |
| tree | f5e6a2057512a9c14d81e5730ed72c7fda27bb7d /libavcodec/svq3.c | |
| parent | e9cb43c6f67c8882dc3f303082e9398a0cff06e1 (diff) | |
| parent | c4e43560fe6677e9d60bfb3cffc41c7324e92a0b (diff) | |
| download | ffmpeg-16466d92b9f795579d4020b1c7cb3ad7750cc182.tar.gz | |
Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'
* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
h264data: Move some tables to the only place they are used
Conflicts:
libavcodec/h264data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 717f89d4ca..cd21cae3fe 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -107,6 +107,13 @@ static const uint8_t svq3_scan[16] = { 0 + 3 * 4, 1 + 3 * 4, 2 + 3 * 4, 3 + 3 * 4, }; +static const uint8_t luma_dc_zigzag_scan[16] = { + 0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64, + 3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64, + 1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64, + 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64, +}; + static const uint8_t svq3_pred_0[25][2] = { { 0, 0 }, { 1, 0 }, { 0, 1 }, |