[SCM] libav/wheezy-security: mpegvideo: remove last_picture_ptr / h264 assert.

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit d1c490448cbe3f7715773c673e92139a7192326f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Aug 6 16:49:49 2012 +0200

    mpegvideo: remove last_picture_ptr / h264 assert.
    
    This assert is no longer true since h264 error concealment needs
    last_picture_ptr to be set.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>
    (cherry picked from commit 91672504a403556f63492093b892574234f21dd7)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>
    
    Conflicts:
    	libavcodec/mpegvideo.c

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f3e2c12..b867be2 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1166,9 +1166,6 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
     Picture *pic;
     s->mb_skipped = 0;
 
-    assert(s->last_picture_ptr == NULL || s->out_format != FMT_H264 ||
-           s->codec_id == CODEC_ID_SVQ3);
-
     /* mark & release old frames */
     if (s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3) {
         if (s->pict_type != AV_PICTURE_TYPE_B && s->last_picture_ptr &&

-- 
Libav/FFmpeg packaging