diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
| commit | 47fc82b5b34677f49bb263ee9e67350cb004fe31 (patch) | |
| tree | 082f3f5e1a65159244427d1362f3caea9092af7c /libavcodec/dsputil.c | |
| parent | e6f69b324e88794c7a2874e5ee8398b3ac41b10c (diff) | |
| parent | 5f9220437025a0d66abc68323b4ce9b50e72d51b (diff) | |
| download | ffmpeg-47fc82b5b34677f49bb263ee9e67350cb004fe31.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index cfa8b768c6..21e3feaca9 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -59,19 +59,6 @@ uint32_t ff_square_tab[512] = { 0, }; #define pb_7f (~0UL / 255 * 0x7f) #define pb_80 (~0UL / 255 * 0x80) -/* Specific zigzag scan for 248 idct. NOTE that unlike the - * specification, we interleave the fields */ -const uint8_t ff_zigzag248_direct[64] = { - 0, 8, 1, 9, 16, 24, 2, 10, - 17, 25, 32, 40, 48, 56, 33, 41, - 18, 26, 3, 11, 4, 12, 19, 27, - 34, 42, 49, 57, 50, 58, 35, 43, - 20, 28, 5, 13, 6, 14, 21, 29, - 36, 44, 51, 59, 52, 60, 37, 45, - 22, 30, 7, 15, 23, 31, 38, 46, - 53, 61, 54, 62, 39, 47, 55, 63, -}; - const uint8_t ff_alternate_horizontal_scan[64] = { 0, 1, 2, 3, 8, 9, 16, 17, 10, 11, 4, 5, 6, 7, 15, 14, |