From cde47411774fcd681c9dfbef2916ef364d284567 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 7 Aug 2012 00:18:59 +0200 Subject: h264: disable assert on current_picture_ptr being null. It is possible in various error pathes as well as gap handling that this has already been allocated. Its not clear why that would be a problem with the current code, thus disable the assert to avoid common assert failure when asserts are enabled. Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index fdfc221ccd..54f23a124b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2836,7 +2836,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) } } else { /* Frame or first field in a potentially complementary pair */ - assert(!s0->current_picture_ptr); +// assert(!s0->current_picture_ptr); s0->first_field = FIELD_PICTURE; } -- cgit v1.2.3