diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 00:18:59 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-05 14:28:41 +0300 |
| commit | 5e997688f8801bb89c773f368237627d957fa520 (patch) | |
| tree | 5553471844d8427b0fdfeee085317cf87b2c8904 /libavcodec | |
| parent | 6980453569b09239d3fcc4cc7335956f36e484d4 (diff) | |
| download | ffmpeg-5e997688f8801bb89c773f368237627d957fa520.tar.gz | |
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@martin.st>
Diffstat (limited to 'libavcodec')
| -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 2c4f07d601..99cf5dc9f3 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; } |