[FFmpeg-cvslog] h264: Remove an assert on current_picture_ptr being null
Michael Niedermayer
git at videolan.org
Thu Sep 6 16:12:43 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 7 00:18:59 2012 +0200| [5e997688f8801bb89c773f368237627d957fa520] | committer: Martin Storsjö
h264: Remove an assert on current_picture_ptr being null
It is possible in various error paths as well as gap handling
that this has already been allocated. It is not clear why that
would be a problem with the current code, thus disable the
assert to avoid a common assert failure when asserts are enabled.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e997688f8801bb89c773f368237627d957fa520
---
libavcodec/h264.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2c4f07d..99cf5dc 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2773,7 +2773,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
}
} else {
/* Frame or first field in a potentially complementary pair */
- assert(!s0->current_picture_ptr);
s0->first_field = FIELD_PICTURE;
}
More information about the ffmpeg-cvslog
mailing list