Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:40:11 +0000 (23:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 22:40:16 +0000 (23:40 +0100)
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_interlace.c

index 8e3c069..a97c64c 100644 (file)
@@ -142,7 +142,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)