[FFmpeg-cvslog] vf_scale: Fix slice position assert to take vertical subsampling into account.

Michael Niedermayer git at videolan.org
Thu Nov 17 23:21:05 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 17 22:39:46 2011 +0100| [32aa9590ac02e477b6ffe83806e735fd4a86c362] | committer: Michael Niedermayer

vf_scale: Fix slice position assert to take vertical subsampling into account.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32aa9590ac02e477b6ffe83806e735fd4a86c362
---

 libavfilter/vf_scale.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index d3d7f0d..8483536 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{



More information about the ffmpeg-cvslog mailing list