X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Feaidct.c;h=5b2db44affa0c7e86e5d79278c3f584c7df36c28;hb=bb198c4997d5036f3bf91de51e44f807115677d0;hp=8a243508f5ab143ff16b3791000f8f95212519ae;hpb=28245435d9b732fbb28102de46bed7d678e33d02;p=ffmpeg diff --git a/libavcodec/eaidct.c b/libavcodec/eaidct.c index 8a243508f5a..5b2db44affa 100644 --- a/libavcodec/eaidct.c +++ b/libavcodec/eaidct.c @@ -2,30 +2,31 @@ * Electronic Arts TGQ/TQI/MAD IDCT algorithm * Copyright (c) 2007-2008 Peter Ross * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file eaidct.c + * @file * Electronic Arts TGQ/TQI/MAD IDCT algorithm * @author Peter Ross */ -#include "dsputil.h" +#include "eaidct.h" +#include "libavutil/common.h" #define ASQRT 181 /* (1/sqrt(2))<<8 */ #define A4 669 /* cos(pi/8)*sqrt(2)<<9 */ @@ -62,7 +63,7 @@ #define MUNGE_8BIT(x) av_clip_uint8((x)>>4) #define IDCT_ROW(dest,src) IDCT_TRANSFORM(dest,0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7,MUNGE_8BIT,src) -static inline void ea_idct_col(DCTELEM *dest, const DCTELEM *src) { +static inline void ea_idct_col(int16_t *dest, const int16_t *src) { if ((src[8]|src[16]|src[24]|src[32]|src[40]|src[48]|src[56])==0) { dest[0] = dest[8] = @@ -76,9 +77,9 @@ static inline void ea_idct_col(DCTELEM *dest, const DCTELEM *src) { IDCT_COL(dest, src); } -void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block) { +void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block) { int i; - DCTELEM temp[64]; + int16_t temp[64]; block[0] += 4; for (i=0; i<8; i++) ea_idct_col(&temp[i], &block[i]);