diff options
| author | Michael Niedermayer <[email protected]> | 2012-08-07 00:18:59 +0200 |
|---|---|---|
| committer | Diego Biurrun <[email protected]> | 2014-08-23 05:19:12 -0700 |
| commit | ec0df23765bd41846f66e4a4fb694779b432fc62 (patch) | |
| tree | ae0f638cdbf22a5d951f4db332affadb33dd1ee8 | |
| parent | 372f742dd18911dc5c6552b1bb2e2ca235c5ee47 (diff) | |
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ö <[email protected]>
(cherry picked from commit 5e997688f8801bb89c773f368237627d957fa520)
Signed-off-by: Diego Biurrun <[email protected]>
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c4853253e5..c53799dfec 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3109,7 +3109,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; } |