virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  lavfi: math typo in interlace filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-18 09:29:35 +02:00
commit e41bf19d2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_interlace.c
View File

@ -149,7 +149,7 @@ static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
srcp_below = srcp; // there is no line below srcp_below = srcp; // there is no line below
for (i = 0; i < linesize; i++) { for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of // 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. // '1 +' is for rounding.
dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2; dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
} }

2
libavfilter/vf_tinterlace.c
View File

@ -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 if (h == 1) srcp_below = srcp; // there is no line below
for (i = 0; i < linesize; i++) { for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of // 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. */ // '1 +' is for rounding. */
dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2; dstp[i] = (1 + srcp[i] + srcp[i] + srcp_above[i] + srcp_below[i]) >> 2;
} }