diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:50:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:50:51 +0100 |
| commit | 82b1bcd7f9b650a9d46a22079c0cdac05badeebc (patch) | |
| tree | bc9e919d6bf6c4f138490d960611ce10c0149f84 /libavfilter/vf_interlace.c | |
| parent | 6279cb3597cc1c70638857a4940aa6a9da9a91c5 (diff) | |
| parent | 15ea222778caaec0877b3f9938140b707c931d96 (diff) | |
| download | ffmpeg-82b1bcd7f9b650a9d46a22079c0cdac05badeebc.tar.gz | |
Merge commit '15ea222778caaec0877b3f9938140b707c931d96'
* commit '15ea222778caaec0877b3f9938140b707c931d96':
vf_interlace: merge FIELD_LOWER check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_interlace.c')
| -rw-r--r-- | libavfilter/vf_interlace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index a97c64c212..a61909409e 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -145,10 +145,10 @@ static void copy_picture_field(InterlaceContext *s, av_assert0(cols >= 0 || lines >= 0); lines = (lines + (field_type == FIELD_UPPER)) / 2; - if (field_type == FIELD_LOWER) + if (field_type == FIELD_LOWER) { srcp += src_frame->linesize[plane]; - if (field_type == FIELD_LOWER) dstp += dst_frame->linesize[plane]; + } if (lowpass) { int srcp_linesize = src_frame->linesize[plane] * 2; int dstp_linesize = dst_frame->linesize[plane] * 2; |