RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-15 22:33:55 +02:00
parent e8c4022018
commit 0114c571d4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo.c
View File

@ -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],