From 91672504a403556f63492093b892574234f21dd7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 6 Aug 2012 16:49:49 +0200 Subject: [PATCH] mpegvideo: remove last_picture_ptr / h264 assert. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This assert is no longer true since h264 error concealment needs last_picture_ptr to be set. Signed-off-by: Martin Storsjö --- libavcodec/mpegvideo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e9aff3b316..718df8b63f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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 && -- 2.11.0