Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/lcldec: Make PNG filter addressing match the code afterwards

Browse Source 
Also update check accordingly

Fixes: tickets/10237/mszh_306_306_yuv422_nocompress.avi
Fixes: tickets/10237/mszh_306_306_yuv411_nocompress.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d11b8bd0c6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/6.0
Michael Niedermayer 2 years ago
parent c8319b4e00
commit 342121cd35
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 6 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      libavcodec/lcldec.c

9
libavcodec/lcldec.c
Unescape View File

@ -229,16 +229,19 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
break; break;
case COMP_MSZH_NOCOMP: { case COMP_MSZH_NOCOMP: {
int bppx2; int bppx2;
int aligned_width = width;
switch (c->imgtype) { switch (c->imgtype) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
case IMGTYPE_RGB24: case IMGTYPE_RGB24:
bppx2 = 6; bppx2 = 6;
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
aligned_width &= ~3;
case IMGTYPE_YUV211: case IMGTYPE_YUV211:
bppx2 = 4; bppx2 = 4;
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
aligned_width &= ~3;
case IMGTYPE_YUV420: case IMGTYPE_YUV420:
bppx2 = 3; bppx2 = 3;
break; break;
@ -246,7 +249,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
bppx2 = 0; // will error out below bppx2 = 0; // will error out below
break; break;
} }
if (len < ((width * height * bppx2) >> 1)) if (len < ((aligned_width * height * bppx2) >> 1))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
break; break;
} }
@ -312,8 +315,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
break; break;
case IMGTYPE_YUV422: case IMGTYPE_YUV422:
pixel_ptr = 0;
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
pixel_ptr = row * width * 2;
yq = uq = vq =0; yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; encoded[pixel_ptr] = yq -= encoded[pixel_ptr];
@ -329,8 +332,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
break; break;
case IMGTYPE_YUV411: case IMGTYPE_YUV411:
pixel_ptr = 0;
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
pixel_ptr = row * width / 2 * 3;
yq = uq = vq =0; yq = uq = vq =0;
for (col = 0; col < width/4; col++) { for (col = 0; col < width/4; col++) {
encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; encoded[pixel_ptr] = yq -= encoded[pixel_ptr];

Write Preview
Loading…
Cancel
Save