ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Tue Aug 7 00:18:59 2012 +0200| [ec0df23765bd41846f66e4a4fb694779b432fc62] | committer: Diego Biurrun
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ö <mar...@martin.st> (cherry picked from commit 5e997688f8801bb89c773f368237627d957fa520) Signed-off-by: Diego Biurrun <di...@biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec0df23765bd41846f66e4a4fb694779b432fc62 --- libavcodec/h264.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c485325..c53799d 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
