diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:58:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:58:41 +0200 |
| commit | 86d1a5d80f161f3295e3422123d08dc312652353 (patch) | |
| tree | 4e8e5fa7235f13a18ed6d0ecc67ef820e983c6a7 /libavfilter/vf_interlace.c | |
| parent | bc8240518830ba0d273bba6246392707ab55da2b (diff) | |
| parent | bec509db4364b9c8b00437939a4197fc12fec3e8 (diff) | |
| download | ffmpeg-86d1a5d80f161f3295e3422123d08dc312652353.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: better handling of odd video size
Conflicts:
libavfilter/vf_interlace.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_interlace.c')
| -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 7cf2e1fc87..eab5cab3fb 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -132,7 +132,7 @@ static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame, av_assert0(linesize >= 0); - lines /= 2; + lines = (lines + (field_type == FIELD_UPPER)) / 2; if (field_type == FIELD_LOWER) srcp += src_frame->linesize[plane]; if (field_type == FIELD_LOWER) |