virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'

Browse Source 
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-06 23:40:11 +01:00
commit 6279cb3597
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_interlace.c
View File

@ -142,7 +142,7 @@ static void copy_picture_field(InterlaceContext *s,
uint8_t *dstp = dst_frame->data[plane]; uint8_t *dstp = dst_frame->data[plane];
const uint8_t *srcp = src_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; lines = (lines + (field_type == FIELD_UPPER)) / 2;
if (field_type == FIELD_LOWER) if (field_type == FIELD_LOWER)