diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-18 09:29:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-18 09:31:05 +0200 |
| commit | e41bf19d2cb0e39e65f67d45a11458751a086d8c (patch) | |
| tree | 5e1f4a5314ebb4b932b7e0e9a8d4a10814eb47f5 | |
| parent | ca2818b88155029bb6f989ee522e7f8e9e9f5927 (diff) | |
| parent | cd0faeee62ffe96f294ad3baf1b55343be63a2a7 (diff) | |
| download | ffmpeg-e41bf19d2cb0e39e65f67d45a11458751a086d8c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_interlace.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_tinterlace.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index 39f60beaca..7cf2e1fc87 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -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; } diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 5e3e058016..1f4de81fc7 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -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; } |