diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2010-02-19 17:17:20 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2010-02-19 17:17:20 +0000 |
| commit | cc01ab903e251455e50af0a1a29ad30eeeec602d (patch) | |
| tree | d1cfd92e2b1f47c86626f2a4aa22d72df5bd6aea /libavcodec/indeo5.c | |
| parent | c02fd3d2e886bcdc82ad52972376310156040c38 (diff) | |
| download | ffmpeg-cc01ab903e251455e50af0a1a29ad30eeeec602d.tar.gz | |
remove ivi5_scans8x8[0], it duplicates ff_zigzag_direct
Originally committed as revision 21897 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/indeo5.c')
| -rw-r--r-- | libavcodec/indeo5.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 43d0c40d22..db92fb697e 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -30,6 +30,7 @@ #define ALT_BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" +#include "dsputil.h" #include "ivi_dsp.h" #include "ivi_common.h" #include "indeo5data.h" @@ -183,25 +184,25 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx) case 0: band->inv_transform = ff_ivi_inverse_slant_8x8; band->dc_transform = ff_ivi_dc_slant_2d; - band->scan = ivi5_scans8x8[0]; + band->scan = ff_zigzag_direct; break; case 1: band->inv_transform = ff_ivi_row_slant8; band->dc_transform = ff_ivi_dc_row_slant; - band->scan = ivi5_scans8x8[1]; + band->scan = ivi5_scans8x8[0]; break; case 2: band->inv_transform = ff_ivi_col_slant8; band->dc_transform = ff_ivi_dc_col_slant; - band->scan = ivi5_scans8x8[2]; + band->scan = ivi5_scans8x8[1]; break; case 3: band->inv_transform = ff_ivi_put_pixels_8x8; band->dc_transform = ff_ivi_put_dc_pixel_8x8; - band->scan = ivi5_scans8x8[2]; + band->scan = ivi5_scans8x8[1]; break; case 4: |