videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-11 23:27:55 +02:00
Code Releases Activity

lavfi/mergeplanes: Fix >8 bit for big endian formats and yuv4xxp16le.

Browse Source 
Fixes part of ticket #5916.
This commit is contained in:
Carl Eugen Hoyos 2016-10-30 00:25:12 +02:00
parent f73a3aacbb
commit 1a65d2a3cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_mergeplanes.c
View File

@ -192,9 +192,9 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = ctx->inputs[0]->sample_aspect_ratio;
s->planewidth[1] =
s->planewidth[2] = AV_CEIL_RSHIFT(outlink->w, s->outdesc->log2_chroma_w);
s->planewidth[2] = AV_CEIL_RSHIFT(((s->outdesc->comp[1].depth > 8) + 1) * outlink->w, s->outdesc->log2_chroma_w);
s->planewidth[0] =
s->planewidth[3] = outlink->w;
s->planewidth[3] = ((s->outdesc->comp[0].depth > 8) + 1) * outlink->w;
s->planeheight[1] =
s->planeheight[2] = AV_CEIL_RSHIFT(outlink->h, s->outdesc->log2_chroma_h);
s->planeheight[0] =
@ -220,9 +220,9 @@ static int config_output(AVFilterLink *outlink)
}
inputp->planewidth[1] =
inputp->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, indesc->log2_chroma_w);
inputp->planewidth[2] = AV_CEIL_RSHIFT(((indesc->comp[1].depth > 8) + 1) * inlink->w, indesc->log2_chroma_w);
inputp->planewidth[0] =
inputp->planewidth[3] = inlink->w;
inputp->planewidth[3] = ((indesc->comp[0].depth > 8) + 1) * inlink->w;
inputp->planeheight[1] =
inputp->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, indesc->log2_chroma_h);
inputp->planeheight[0] =