highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/fieldmatch: fix fields copy when plane height is odd

Browse Source 
Fixes Ticket 5187
This commit is contained in:
Clément Bœsch
2016-02-07 15:49:20 +01:00
parent f5c3f85eb2
commit 6c0318c4ba
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vf_fieldmatch.c
View File

@ -608,10 +608,13 @@ static void copy_fields(const FieldMatchContext *fm, AVFrame *dst,
const AVFrame *src, int field) const AVFrame *src, int field)
{ {
int plane; int plane;
for (plane = 0; plane < 4 && src->data[plane] && src->linesize[plane]; plane++) for (plane = 0; plane < 4 && src->data[plane] && src->linesize[plane]; plane++) {
const int plane_h = get_height(fm, src, plane);
const int nb_copy_fields = (plane_h >> 1) + (field ? 0 : (plane_h & 1));
av_image_copy_plane(dst->data[plane] + field*dst->linesize[plane], dst->linesize[plane] << 1, av_image_copy_plane(dst->data[plane] + field*dst->linesize[plane], dst->linesize[plane] << 1,
src->data[plane] + field*src->linesize[plane], src->linesize[plane] << 1, src->data[plane] + field*src->linesize[plane], src->linesize[plane] << 1,
get_width(fm, src, plane), get_height(fm, src, plane) / 2); get_width(fm, src, plane), nb_copy_fields);
}
} }
static AVFrame *create_weave_frame(AVFilterContext *ctx, int match, int field, static AVFrame *create_weave_frame(AVFilterContext *ctx, int match, int field,