[FFmpeg-cvslog] mpegvideo: remove last_picture_ptr / h264 assert.

Michael Niedermayer git at videolan.org
Wed Sep 5 13:52:54 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  6 16:49:49 2012 +0200| [91672504a403556f63492093b892574234f21dd7] | committer: Martin Storsjö

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>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91672504a403556f63492093b892574234f21dd7
---

 libavcodec/mpegvideo.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index e9aff3b..718df8b 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 &&



More information about the ffmpeg-cvslog mailing list