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

Michael Niedermayer git at videolan.org
Mon Aug 6 16:58:33 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  6 16:49:49 2012 +0200| [610c67df37bf362319037fc4ef9aab8057947176] | committer: Michael Niedermayer

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: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d6d1005..bd9b913 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1141,9 +1141,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 == CODEC_ID_SVQ3);
-
     if (!ff_thread_can_start_frame(avctx)) {
         av_log(avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n");
         return -1;



More information about the ffmpeg-cvslog mailing list