[SCM] libav/wheezy-security: h264: Remove an assert on current_picture_ptr being null

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit ec0df23765bd41846f66e4a4fb694779b432fc62
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Aug 7 00:18:59 2012 +0200

    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 at martin.st>
    (cherry picked from commit 5e997688f8801bb89c773f368237627d957fa520)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

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;
         }
 

-- 
Libav/FFmpeg packaging