diff options
Diffstat (limited to 'libavcodec/blockdsp.c')
| -rw-r--r-- | libavcodec/blockdsp.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index e3d2ca1fdc..a5c527a4da 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -1,18 +1,18 @@ /* - * 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 */ @@ -25,12 +25,12 @@ #include "blockdsp.h" #include "version.h" -static void clear_block_8_c(int16_t *block) +static void clear_block_c(int16_t *block) { memset(block, 0, sizeof(int16_t) * 64); } -static void clear_blocks_8_c(int16_t *blocks) +static void clear_blocks_c(int16_t *blocks) { memset(blocks, 0, sizeof(int16_t) * 6 * 64); } @@ -57,22 +57,20 @@ static void fill_block8_c(uint8_t *block, uint8_t value, int line_size, int h) av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx) { - const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8; - - c->clear_block = clear_block_8_c; - c->clear_blocks = clear_blocks_8_c; + c->clear_block = clear_block_c; + c->clear_blocks = clear_blocks_c; c->fill_block_tab[0] = fill_block16_c; c->fill_block_tab[1] = fill_block8_c; + if (ARCH_ALPHA) + ff_blockdsp_init_alpha(c); if (ARCH_ARM) - ff_blockdsp_init_arm(c, high_bit_depth); + ff_blockdsp_init_arm(c); if (ARCH_PPC) - ff_blockdsp_init_ppc(c, high_bit_depth); + ff_blockdsp_init_ppc(c); if (ARCH_X86) -#if FF_API_XVMC - ff_blockdsp_init_x86(c, high_bit_depth, avctx); -#else - ff_blockdsp_init_x86(c, high_bit_depth); -#endif /* FF_API_XVMC */ + ff_blockdsp_init_x86(c, avctx); + if (ARCH_MIPS) + ff_blockdsp_init_mips(c); } |