diff options
Diffstat (limited to 'libavcodec/mpegvideoencdsp.c')
| -rw-r--r-- | libavcodec/mpegvideoencdsp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c index 279d233fbc..a34ab3553e 100644 --- a/libavcodec/mpegvideoencdsp.c +++ b/libavcodec/mpegvideoencdsp.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 */ @@ -21,6 +21,7 @@ #include <string.h> #include "config.h" +#include "libavutil/avassert.h" #include "libavutil/attributes.h" #include "libavutil/imgutils.h" #include "avcodec.h" @@ -39,7 +40,7 @@ static int try_8x8basis_c(int16_t rem[64], int16_t weight[64], (BASIS_SHIFT - RECON_SHIFT)); int w = weight[i]; b >>= RECON_SHIFT; - assert(-512 < b && b < 512); + av_assert2(-512 < b && b < 512); sum += (w * b) * (w * b) >> 4; } @@ -80,7 +81,7 @@ static int pix_sum_c(uint8_t *pix, int line_size) static int pix_norm1_c(uint8_t *pix, int line_size) { int s = 0, i, j; - uint32_t *sq = ff_square_tab + 256; + const uint32_t *sq = ff_square_tab + 256; for (i = 0; i < 16; i++) { for (j = 0; j < 16; j += 8) { @@ -250,4 +251,6 @@ av_cold void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c, ff_mpegvideoencdsp_init_ppc(c, avctx); if (ARCH_X86) ff_mpegvideoencdsp_init_x86(c, avctx); + if (ARCH_MIPS) + ff_mpegvideoencdsp_init_mips(c, avctx); } |