h264: disable assert on current_picture_ptr being null.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)
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>
libavcodec/h264.c

index fdfc221..54f23a1 100644 (file)
@@ -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;
         }