ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 25 17:34:03 2014 +0100| [2f1de5ca139f185b7103caa6e5843b4fa7a78d57] | committer: Michael Niedermayer
avcodec/huffyuvdec: apply vertical filter in steps of 1 line for interlaced BGRA Fixes out of array read Fixes: signal_sigsegv_3287332_2301_cov_2994954934_huffyuv.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f1de5ca139f185b7103caa6e5843b4fa7a78d57 --- libavcodec/huffyuvdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 62ed0f9..98c6128 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -1202,11 +1202,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (s->predictor == PLANE) { if (s->bitstream_bpp != 32) left[A] = 0; - if ((y & s->interlaced) == 0 && - y < s->height - 1 - s->interlaced) { + if (y < s->height - 1 - s->interlaced) { s->hdsp.add_bytes(p->data[0] + p->linesize[0] * y, p->data[0] + p->linesize[0] * y + - fake_ystride, fake_ystride); + fake_ystride, 4 * width); } } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
