OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
046f75a
)
vf_interlace: merge FIELD_LOWER check
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 2 Dec 2014 14:58:41 +0000
(14:58 +0000)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 5 Jan 2015 14:35:46 +0000
(15:35 +0100)
libavfilter/vf_interlace.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_interlace.c
b/libavfilter/vf_interlace.c
index
0b2444c
..
0f551ca
100644
(file)
--- a/
libavfilter/vf_interlace.c
+++ b/
libavfilter/vf_interlace.c
@@
-144,10
+144,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;