From 220f2bd9c595c7934753694854d4a778358d5c4d Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Wed, 26 May 2010 13:25:16 +0000 Subject: move indeo5 scan patterns into ivi_common.c so those can be shared by indeo4. Originally committed as revision 23335 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/indeo5.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/indeo5.c') diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 2593e55272..3dd976f7f9 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -185,25 +185,25 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx) case 1: band->inv_transform = ff_ivi_row_slant8; band->dc_transform = ff_ivi_dc_row_slant; - band->scan = ivi5_scans8x8[0]; + band->scan = ivi_vertical_scan_8x8; break; case 2: band->inv_transform = ff_ivi_col_slant8; band->dc_transform = ff_ivi_dc_col_slant; - band->scan = ivi5_scans8x8[1]; + band->scan = ivi_horizontal_scan_8x8; break; case 3: band->inv_transform = ff_ivi_put_pixels_8x8; band->dc_transform = ff_ivi_put_dc_pixel_8x8; - band->scan = ivi5_scans8x8[1]; + band->scan = ivi_horizontal_scan_8x8; break; case 4: band->inv_transform = ff_ivi_inverse_slant_4x4; band->dc_transform = ff_ivi_dc_slant_2d; - band->scan = ivi5_scan4x4; + band->scan = ivi_direct_scan_4x4; break; } -- cgit v1.2.3