mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
lavc/rectangle: change assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
107b42388c
commit
3422e7c395
@ -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"
|
||||
#include "dsputil.h"
|
||||
|
||||
/**
|
||||
@ -41,14 +41,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((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
|
||||
assert((stride&(w-1))==0);
|
||||
av_assert2((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-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;
|
||||
@ -118,8 +118,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 */
|
||||
|
Loading…
Reference in New Issue
Block a user