[FFmpeg-devel] [PATCH] avcodec/mpegpicture: guard "stride changed" failures against unknown uvlinesize
Aman Gupta
ffmpeg at tmm1.net
Tue Apr 10 20:20:07 EEST 2018
From: Aman Gupta <aman at tmm1.net>
Before adding uvlinesize check, I was seeing failures decoding
some samples (shown with extra logging added):
[mpeg2video @ 0x7fa193818c00] get_buffer() failed (stride changed: linesize=1280/1280 uvlinesize=0/640)
[mpeg2video @ 0x7fa193818c00] get_buffer() failed (stride changed: linesize=1280/1280 uvlinesize=0/640)
---
libavcodec/mpegpicture.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c
index 2be670cdbc..80898c161c 100644
--- a/libavcodec/mpegpicture.c
+++ b/libavcodec/mpegpicture.c
@@ -148,10 +148,13 @@ static int alloc_frame_buffer(AVCodecContext *avctx, Picture *pic,
}
}
- if (linesize && (linesize != pic->f->linesize[0] ||
- uvlinesize != pic->f->linesize[1])) {
+ if (linesize && uvlinesize &&
+ (linesize != pic->f->linesize[0] ||
+ uvlinesize != pic->f->linesize[1])) {
av_log(avctx, AV_LOG_ERROR,
- "get_buffer() failed (stride changed)\n");
+ "get_buffer() failed (stride changed: linesize=%d/%d uvlinesize=%d/%d)\n",
+ linesize, pic->f->linesize[0],
+ uvlinesize, pic->f->linesize[1]);
ff_mpeg_unref_picture(avctx, pic);
return -1;
}
--
2.14.2
More information about the ffmpeg-devel
mailing list