summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-07 00:18:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-07 00:18:59 +0200
commitcde47411774fcd681c9dfbef2916ef364d284567 (patch)
treeb6624eb96cee312bca13083a4ef2532af3897b0d
parent7ae473e8a04f686bbeda75c40167c2df4211e662 (diff)
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 <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
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;
}