diff options
Diffstat (limited to 'libavcodec/rv40dsp.c')
-rw-r--r-- | libavcodec/rv40dsp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 4ca5cc7..5579bd9 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -2,20 +2,20 @@ * RV40 decoder motion compensation functions * Copyright (c) 2008 Konstantin Shishkov * - * 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 */ @@ -32,6 +32,7 @@ #include "pixels.h" #include "rnd_avg.h" #include "rv34dsp.h" +#include "libavutil/avassert.h" #define RV40_LOWPASS(OPNAME, OP) \ static void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride,\ @@ -302,7 +303,7 @@ static void OPNAME ## rv40_chroma_mc4_c(uint8_t *dst /*align 8*/,\ int i;\ int bias = rv40_bias[y>>1][x>>1];\ \ - assert(x<8 && y<8 && x>=0 && y>=0);\ + av_assert2(x<8 && y<8 && x>=0 && y>=0);\ \ if(D){\ for(i = 0; i < h; i++){\ @@ -338,7 +339,7 @@ static void OPNAME ## rv40_chroma_mc8_c(uint8_t *dst/*align 8*/,\ int i;\ int bias = rv40_bias[y>>1][x>>1];\ \ - assert(x<8 && y<8 && x>=0 && y>=0);\ + av_assert2(x<8 && y<8 && x>=0 && y>=0);\ \ if(D){\ for(i = 0; i < h; i++){\ @@ -454,7 +455,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src, if (u > 3 - (filter_p1 && filter_q1)) continue; - t <<= 2; + t *= 1 << 2; if (filter_p1 && filter_q1) t += src[-2*step] - src[1*step]; |