ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Apr 26 12:28:36 2015 +0200| [febbb3cbd3950803c4482d1221c87ffe9ce81361] | committer: Michael Niedermayer
avcodec/h264_slice: Change a few asserts to av_assert* Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=febbb3cbd3950803c4482d1221c87ffe9ce81361 --- libavcodec/h264_slice.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 33aff97..320845e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -404,7 +404,7 @@ static void copy_picture_range(H264Picture **to, H264Picture **from, int count, int i; for (i = 0; i < count; i++) { - assert((IN_RANGE(from[i], old_base, sizeof(*old_base)) || + av_assert1((IN_RANGE(from[i], old_base, sizeof(*old_base)) || IN_RANGE(from[i], old_base->DPB, sizeof(H264Picture) * H264_MAX_PICTURE_COUNT) || !from[i])); @@ -1501,8 +1501,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) * We have to do that before the "dummy" in-between frame allocation, * since that can modify h->cur_pic_ptr. */ if (h->first_field) { - assert(h->cur_pic_ptr); - assert(h->cur_pic_ptr->f.buf[0]); + av_assert0(h->cur_pic_ptr); + av_assert0(h->cur_pic_ptr->f.buf[0]); assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); /* Mark old field/frame as completed */ @@ -1604,8 +1604,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) * We're using that to see whether to continue decoding in that * frame, or to allocate a new one. */ if (h->first_field) { - assert(h->cur_pic_ptr); - assert(h->cur_pic_ptr->f.buf[0]); + av_assert0(h->cur_pic_ptr); + av_assert0(h->cur_pic_ptr->f.buf[0]); assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); /* figure out if we have a complementary field pair */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
