diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 12:02:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 12:56:49 +0200 |
| commit | b7c2358f6237af5f946168d486f72e33cecd7093 (patch) | |
| tree | 6e6d89347b47e975521a6f70699ea086ba2abe0f /libavcodec | |
| parent | 5e59a77cec804a9b44c60ea22c17beba6453ef23 (diff) | |
| download | ffmpeg-b7c2358f6237af5f946168d486f72e33cecd7093.tar.gz | |
error_concealment: switch asserts mostly to av_asserts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/error_resilience.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index c93cea58dc..b853a90e2a 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -53,7 +53,7 @@ static void decode_mb(MpegEncContext *s, int ref) H264Context *h = (void*)s; h->mb_xy = s->mb_x + s->mb_y * s->mb_stride; memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache)); - assert(ref >= 0); + av_assert1(ref >= 0); /* FIXME: It is possible albeit uncommon that slice references * differ between slices. We take the easy approach and ignore * it for now. If this turns out to have any relevance in @@ -81,7 +81,7 @@ static void set_mv_strides(MpegEncContext *s, int *mv_step, int *stride) { if (s->codec_id == CODEC_ID_H264) { H264Context *h = (void*)s; - assert(s->quarter_sample); + av_assert0(s->quarter_sample); *mv_step = 4; *stride = h->b_stride; } else { @@ -493,8 +493,8 @@ static void guess_mv(MpegEncContext *s) if (fixed[mb_xy] == MV_FROZEN) continue; - assert(!IS_INTRA(s->current_picture.f.mb_type[mb_xy])); - assert(s->last_picture_ptr && s->last_picture_ptr->f.data[0]); + av_assert1(!IS_INTRA(s->current_picture.f.mb_type[mb_xy])); + av_assert1(s->last_picture_ptr && s->last_picture_ptr->f.data[0]); j = 0; if (mb_x > 0 && fixed[mb_xy - 1] == MV_FROZEN) |