diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 16:40:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 16:40:22 +0200 |
| commit | e6690b6a569faaa6c60978485ffb91ebcaafe19b (patch) | |
| tree | 816f3eb34dc538a646aa9fbd4be5affe5b398b16 | |
| parent | 3e0b4e32c9ee716feb62e3ac3420e421fd802dc7 (diff) | |
| download | ffmpeg-e6690b6a569faaa6c60978485ffb91ebcaafe19b.tar.gz | |
mpegvideo.c: convert some asserts to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ce5d40e8bf..d6d1005018 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1554,7 +1554,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict) else if (!USES_LIST(mb_type, 0)) av_log(s->avctx, AV_LOG_DEBUG, "<"); else { - assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); + av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); av_log(s->avctx, AV_LOG_DEBUG, "X"); } @@ -1739,7 +1739,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict) } else if (!USES_LIST(mb_type, 0)) { COLOR(0, 48) } else { - assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); + av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); COLOR(300,48) } @@ -2165,7 +2165,7 @@ static inline void MPV_motion_lowres(MpegEncContext *s, } break; default: - assert(0); + av_assert2(0); } } @@ -2333,7 +2333,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], if (s->mb_skipped) { s->mb_skipped= 0; - assert(s->pict_type!=AV_PICTURE_TYPE_I); + av_assert2(s->pict_type!=AV_PICTURE_TYPE_I); *mbskip_ptr = 1; } else if(!s->current_picture.f.reference) { *mbskip_ptr = 1; @@ -2627,7 +2627,7 @@ void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename s->dest[0] += (s->mb_y>>1) * linesize << mb_size; s->dest[1] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift); s->dest[2] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift); - assert((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD)); + av_assert1((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD)); } } } |