diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:40:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:40:16 +0100 |
| commit | 6279cb3597cc1c70638857a4940aa6a9da9a91c5 (patch) | |
| tree | f6fa045f3a8f7e6981131ca143397ef2231a0f9d /libavfilter | |
| parent | ac3f6429ba5b596406da12746659f1fb7c5b7b07 (diff) | |
| parent | 046f75a970701b4c947d38bfd2186dcc5f2ddae2 (diff) | |
| download | ffmpeg-6279cb3597cc1c70638857a4940aa6a9da9a91c5.tar.gz | |
Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
vf_interlace: also assert for height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_interlace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index 8e3c069fa3..a97c64c212 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -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) |