Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-02-07 17:49:20 +0300
committerClément Bœsch <u@pkh.me>2016-02-07 17:49:20 +0300
commit6c0318c4ba8e749911324d96e7c04fcc04661c97 (patch)
tree42cae3ba0ec3379d0176de114424e493fa9a5ed6 /libavfilter/vf_fieldmatch.c
parentf5c3f85eb25cb720fca300841771ce26911f872f (diff)
lavfi/fieldmatch: fix fields copy when plane height is odd
Fixes Ticket 5187
Diffstat (limited to 'libavfilter/vf_fieldmatch.c')
-rw-r--r--libavfilter/vf_fieldmatch.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
index 7e277626f7..e155712caa 100644
--- a/libavfilter/vf_fieldmatch.c
+++ b/libavfilter/vf_fieldmatch.c
@@ -608,10 +608,13 @@ static void copy_fields(const FieldMatchContext *fm, AVFrame *dst,
const AVFrame *src, int field)
{
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,
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,