Commit 0114c571 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e8c40220
...@@ -1354,7 +1354,9 @@ void ff_MPV_frame_end(MpegEncContext *s) ...@@ -1354,7 +1354,9 @@ void ff_MPV_frame_end(MpegEncContext *s)
s->unrestricted_mv && s->unrestricted_mv &&
s->current_picture.f.reference && s->current_picture.f.reference &&
!s->intra_only && !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 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; 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], s->dsp.draw_edges(s->current_picture.f.data[0], s->current_picture.f.linesize[0],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment