virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/h264_slice: Change a few asserts to av_assert*

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-26 12:28:36 +02:00
parent fa2d3b6dbe
commit febbb3cbd3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264_slice.c
View File

@ -404,7 +404,7 @@ static void copy_picture_range(H264Picture **to, H264Picture **from, int count,
int i; int i;
for (i = 0; i < count; 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, IN_RANGE(from[i], old_base->DPB,
sizeof(H264Picture) * H264_MAX_PICTURE_COUNT) || sizeof(H264Picture) * H264_MAX_PICTURE_COUNT) ||
!from[i])); !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, * We have to do that before the "dummy" in-between frame allocation,
* since that can modify h->cur_pic_ptr. */ * since that can modify h->cur_pic_ptr. */
if (h->first_field) { if (h->first_field) {
assert(h->cur_pic_ptr); av_assert0(h->cur_pic_ptr);
assert(h->cur_pic_ptr->f.buf[0]); av_assert0(h->cur_pic_ptr->f.buf[0]);
assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF);
/* Mark old field/frame as completed */ /* 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 * We're using that to see whether to continue decoding in that
* frame, or to allocate a new one. */ * frame, or to allocate a new one. */
if (h->first_field) { if (h->first_field) {
assert(h->cur_pic_ptr); av_assert0(h->cur_pic_ptr);
assert(h->cur_pic_ptr->f.buf[0]); av_assert0(h->cur_pic_ptr->f.buf[0]);
assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF);
/* figure out if we have a complementary field pair */ /* figure out if we have a complementary field pair */