Module: libav Branch: master Commit: 91672504a403556f63492093b892574234f21dd7
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> 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ö <[email protected]> --- libavcodec/mpegvideo.c | 3 --- 1 files changed, 0 insertions(+), 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 && _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
