mpegvideo: remove last_picture_ptr / h264 assert.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)
committerMartin Storsjö <martin@martin.st>
Tue, 4 Sep 2012 15:38:02 +0000 (18:38 +0300)
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/mpegvideo.c

index e9aff3b..718df8b 100644 (file)
@@ -1175,9 +1175,6 @@ int ff_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 == AV_CODEC_ID_SVQ3);
-
     /* mark & release old frames */
     if (s->out_format != FMT_H264 || s->codec_id == AV_CODEC_ID_SVQ3) {
         if (s->pict_type != AV_PICTURE_TYPE_B && s->last_picture_ptr &&