diff options
Diffstat (limited to 'libavcodec/rectangle.h')
| -rw-r--r-- | libavcodec/rectangle.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index 73e8b0a..594a760 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -2,20 +2,20 @@ * rectangle filling function * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * 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 */ @@ -28,9 +28,9 @@ #ifndef AVCODEC_RECTANGLE_H #define AVCODEC_RECTANGLE_H -#include <assert.h> #include "config.h" #include "libavutil/common.h" +#include "libavutil/avassert.h" /** * fill a rectangle. @@ -40,13 +40,14 @@ */ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ uint8_t *p= (uint8_t*)vp; - assert(size==1 || size==2 || size==4); - assert(w<=4); + av_assert2(size==1 || size==2 || size==4); + av_assert2(w<=4); w *= size; stride *= size; - assert((stride&(w-1))==0); + av_assert2((((long)vp)&(FFMIN(w, 8<<(HAVE_NEON|ARCH_PPC|HAVE_MMX))-1)) == 0); + av_assert2((stride&(w-1))==0); if(w==2){ const uint16_t v= size==4 ? val : val*0x0101; *(uint16_t*)(p + 0*stride)= v; @@ -116,8 +117,8 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, *(uint32_t*)(p +12+3*stride)= val; #endif }else - assert(0); - assert(h==4); + av_assert2(0); + av_assert2(h==4); } #endif /* AVCODEC_RECTANGLE_H */ |
