[FFmpeg-cvslog] error_concealment: switch asserts mostly to av_asserts.
Michael Niedermayer
git at videolan.org
Thu Apr 19 13:34:51 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 19 12:02:29 2012 +0200| [b7c2358f6237af5f946168d486f72e33cecd7093] | committer: Michael Niedermayer
error_concealment: switch asserts mostly to av_asserts.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7c2358f6237af5f946168d486f72e33cecd7093
---
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 c93cea5..b853a90 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)
More information about the ffmpeg-cvslog
mailing list