diff options
Diffstat (limited to 'libavcodec/proresdsp.c')
| -rw-r--r-- | libavcodec/proresdsp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 1d60897cc9..b523064950 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -3,20 +3,20 @@ * * 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 */ @@ -31,7 +31,7 @@ #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels #define CLIP_MAX (1 << PRORES_BITS_PER_SAMPLE) - CLIP_MIN - 1 ///< maximum value for clipping resulting pixels -#define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX)) +#define CLIP(x) (av_clip((x), CLIP_MIN, CLIP_MAX)) /** * Add bias value, clamp and output pixels of a slice @@ -44,7 +44,7 @@ static void put_pixels(uint16_t *dst, int stride, const int16_t *in) for (x = 0; x < 8; x++) { src_offset = (y << 3) + x; - dst[dst_offset + x] = CLIP_AND_BIAS(in[src_offset]); + dst[dst_offset + x] = CLIP(in[src_offset]); } } } @@ -55,13 +55,13 @@ static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const put_pixels(out, linesize >> 1, block); } -av_cold void ff_proresdsp_init(ProresDSPContext *dsp) +av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { dsp->idct_put = prores_idct_put_c; dsp->idct_permutation_type = FF_NO_IDCT_PERM; if (ARCH_X86) - ff_proresdsp_init_x86(dsp); + ff_proresdsp_init_x86(dsp, avctx); ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); |