Commit e41bf19d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: math typo in interlace filter
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ca2818b8 cd0faeee
......@@ -149,7 +149,7 @@ static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
srcp_below = srcp; // there is no line below
for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of
// '0.5 * current + 0.25 * above + 0.25 + below'
// '0.5 * current + 0.25 * above + 0.25 * below'
// '1 +' is for rounding.
dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
}
......
......@@ -202,7 +202,7 @@ void copy_picture_field(uint8_t *dst[4], int dst_linesize[4],
if (h == 1) srcp_below = srcp; // there is no line below
for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of
// '0.5 * current + 0.25 * above + 0.25 + below'
// '0.5 * current + 0.25 * above + 0.25 * below'
// '1 +' is for rounding. */
dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment