aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-17 22:39:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-17 22:39:46 +0100
commit32aa9590ac02e477b6ffe83806e735fd4a86c362 (patch)
tree41fb24e0657e0c99334946b25eb5dbfe1150b3be
parent5bccb2d0965a66c132798c748b64a5025a5636a9 (diff)
downloadffmpeg-32aa9590ac02e477b6ffe83806e735fd4a86c362.tar.gz
vf_scale: Fix slice position assert to take vertical subsampling into account.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/vf_scale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index d3d7f0d1a8..8483536404 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -304,7 +304,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
scale->slice_y = link->dst->outputs[0]->h;
if(scale->interlaced>0 || (scale->interlaced<0 && link->cur_buf->video->interlaced)){
- av_assert0(y%4 == 0);
+ av_assert0(y%(2<<scale->vsub) == 0);
out_h = scale_slice(link, scale->isws[0], y, (h+1)/2, 2, 0);
out_h+= scale_slice(link, scale->isws[1], y, h /2, 2, 1);
}else{