virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/lcldec: Fix undefined NULL + 0

Browse Source 
Affected the FATE tests vsynth*-zlib, mszh and zlib.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-26 14:11:18 +01:00
committed by Andreas Rheinhardt
parent 911fe69c5f
commit dd9cbd1cc3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/lcldec.c
View File

@@ -173,7 +173,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
int uqvq, ret; int uqvq, ret;
unsigned int mthread_inlen, mthread_outlen; unsigned int mthread_inlen, mthread_outlen;
unsigned int len = buf_size; unsigned int len = buf_size;
int linesize; int linesize, offset;
if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0)
return ret; return ret;
@@ -373,8 +373,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
/* Convert colorspace */ /* Convert colorspace */
y_out = frame->data[0] + (height - 1) * frame->linesize[0]; y_out = frame->data[0] + (height - 1) * frame->linesize[0];
u_out = frame->data[1] + (height - 1) * frame->linesize[1]; offset = (height - 1) * frame->linesize[1];
v_out = frame->data[2] + (height - 1) * frame->linesize[2]; u_out = FF_PTR_ADD(frame->data[1], offset);
offset = (height - 1) * frame->linesize[2];
v_out = FF_PTR_ADD(frame->data[2], offset);
switch (c->imgtype) { switch (c->imgtype) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {