Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-06 18:49:49 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-08-06 18:49:49 +0400
commit610c67df37bf362319037fc4ef9aab8057947176 (patch)
tree8b719e723de79d3c98f8d46e1b365fdb1d8786f7 /libavcodec
parente6690b6a569faaa6c60978485ffb91ebcaafe19b (diff)
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@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d6d1005018..bd9b913a34 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;