diff options
Diffstat (limited to 'ffmpeg/libavcodec/proresdsp.c')
| -rw-r--r-- | ffmpeg/libavcodec/proresdsp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ffmpeg/libavcodec/proresdsp.c b/ffmpeg/libavcodec/proresdsp.c index d73de46..4ff219e 100644 --- a/ffmpeg/libavcodec/proresdsp.c +++ b/ffmpeg/libavcodec/proresdsp.c @@ -3,28 +3,29 @@ * * Copyright (c) 2010-2011 Maxim Poliakovski * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" +#include "libavutil/common.h" #include "dct.h" #include "dsputil.h" #include "proresdsp.h" #include "simple_idct.h" -#include "libavutil/common.h" #define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels @@ -56,7 +57,7 @@ static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const } #endif -#if CONFIG_PRORES_KOSTYA_ENCODER +#if CONFIG_PRORES_KS_ENCODER static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block) { int x, y; @@ -71,7 +72,7 @@ static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block) } #endif -void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) +av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { #if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER dsp->idct_put = prores_idct_put_c; @@ -82,7 +83,7 @@ void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); #endif -#if CONFIG_PRORES_KOSTYA_ENCODER +#if CONFIG_PRORES_KS_ENCODER dsp->fdct = prores_fdct_c; dsp->dct_permutation_type = FF_NO_IDCT_PERM; ff_init_scantable_permutation(dsp->dct_permutation, |