diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 16:49:49 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-04 18:38:02 +0300 |
| commit | 91672504a403556f63492093b892574234f21dd7 (patch) | |
| tree | 32ab3c5358f0c6ded20c60fe17535b821756732c /libavcodec | |
| parent | 19000122a4cc7551cef19ccc6ce4db82d7d290bd (diff) | |
| download | ffmpeg-91672504a403556f63492093b892574234f21dd7.tar.gz | |
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@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 0 insertions, 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 && |