[FFmpeg-cvslog] vf_interlace: also assert for height

Vittorio Giovara git at videolan.org
Tue Jan 6 23:51:00 CET 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Dec  2 14:58:39 2014 +0000| [046f75a970701b4c947d38bfd2186dcc5f2ddae2] | committer: Vittorio Giovara

vf_interlace: also assert for height

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

 libavfilter/vf_interlace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index 3e2a044..0b2444c 100644
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@ -141,7 +141,7 @@ static void copy_picture_field(InterlaceContext *s,
         uint8_t *dstp = dst_frame->data[plane];
         const uint8_t *srcp = src_frame->data[plane];
 
-        av_assert0(cols >= 0);
+        av_assert0(cols >= 0 || lines >= 0);
 
         lines = (lines + (field_type == FIELD_UPPER)) / 2;
         if (field_type == FIELD_LOWER)



More information about the ffmpeg-cvslog mailing list