generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Remove an assert on current_picture_ptr being null

Browse Source 
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>
(cherry picked from commit 5e997688f8)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Michael Niedermayer
2012-08-07 00:18:59 +02:00
committed by Diego Biurrun
parent 372f742dd1
commit ec0df23765
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264.c
View File

@@ -3109,7 +3109,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
} else { } else {
/* Frame or first field in a potentially complementary pair */ /* Frame or first field in a potentially complementary pair */
assert(!s0->current_picture_ptr);
s0->first_field = FIELD_PICTURE; s0->first_field = FIELD_PICTURE;
} }