virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpegvideo_common.h: use av_assert

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-16 17:58:40 +02:00
parent 809d71d650
commit 3000074495
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo_common.h
View File

@ -31,6 +31,7 @@
#define AVCODEC_MPEGVIDEO_COMMON_H #define AVCODEC_MPEGVIDEO_COMMON_H
#include <string.h> #include <string.h>
#include "libavutil/avassert.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
@ -439,7 +440,7 @@ static inline void obmc_motion(MpegEncContext *s,
int i; int i;
uint8_t *ptr[5]; uint8_t *ptr[5];
assert(s->quarter_sample==0); av_assert2(s->quarter_sample==0);
for(i=0; i<5; i++){ for(i=0; i<5; i++){
if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){
@ -649,7 +650,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s,
const int mot_stride= s->b8_stride; const int mot_stride= s->b8_stride;
const int mot_xy= mb_x*2 + mb_y*2*mot_stride; const int mot_xy= mb_x*2 + mb_y*2*mot_stride;
assert(!s->mb_skipped); av_assert2(!s->mb_skipped);
memcpy(mv_cache[1][1], s->current_picture.f.motion_val[0][mot_xy ], sizeof(int16_t) * 4); memcpy(mv_cache[1][1], s->current_picture.f.motion_val[0][mot_xy ], sizeof(int16_t) * 4);
memcpy(mv_cache[2][1], s->current_picture.f.motion_val[0][mot_xy + mot_stride], sizeof(int16_t) * 4); memcpy(mv_cache[2][1], s->current_picture.f.motion_val[0][mot_xy + mot_stride], sizeof(int16_t) * 4);
@ -870,7 +871,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s,
} }
} }
break; break;
default: assert(0); default: av_assert2(0);
} }
} }