From 0114c571d4c8cc1036850ced924683709390681a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 15 Aug 2012 22:33:55 +0200 Subject: [PATCH] mpegvideo: dont call draw edges on lowres this crashes otherwise, and can happen from try_decode_frame() in the case of decoding errors Fixes Ticket1602 Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 22a9ec830e..fc05b5f1d1 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1354,7 +1354,9 @@ void ff_MPV_frame_end(MpegEncContext *s) s->unrestricted_mv && s->current_picture.f.reference && !s->intra_only && - !(s->flags & CODEC_FLAG_EMU_EDGE)) { + !(s->flags & CODEC_FLAG_EMU_EDGE) && + !s->avctx->lowres + ) { int hshift = av_pix_fmt_descriptors[s->avctx->pix_fmt].log2_chroma_w; int vshift = av_pix_fmt_descriptors[s->avctx->pix_fmt].log2_chroma_h; s->dsp.draw_edges(s->current_picture.f.data[0], s->current_picture.f.linesize[0],