[FFmpeg-cvslog] avfilter/interlace: rename two variables for consistency
Thomas Mundt
git at videolan.org
Mon Sep 25 23:14:35 EEST 2017
ffmpeg | branch: master | Thomas Mundt <tmundt75 at gmail.com> | Tue Sep 19 22:49:09 2017 +0200| [d491d6a0cd01d9a1ab2061c6c8a977b1aa578d70] | committer: Carl Eugen Hoyos
avfilter/interlace: rename two variables for consistency
Signed-off-by: Thomas Mundt <tmundt75 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d491d6a0cd01d9a1ab2061c6c8a977b1aa578d70
---
libavfilter/vf_interlace.c | 10 +++++-----
libavfilter/vf_tinterlace.c | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index 0fdfe70f4c..731069818f 100644
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@ -102,19 +102,19 @@ static void lowpass_line_complex_c(uint8_t *dstp, ptrdiff_t linesize,
const uint8_t *srcp_below = srcp + pref;
const uint8_t *srcp_above2 = srcp + mref * 2;
const uint8_t *srcp_below2 = srcp + pref * 2;
- int i, srcp_x, srcp_ab;
+ int i, src_x, src_ab;
for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of
// '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2'
// '4 +' is for rounding.
- srcp_x = srcp[i] << 1;
- srcp_ab = srcp_above[i] + srcp_below[i];
- dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1)
+ src_x = srcp[i] << 1;
+ src_ab = srcp_above[i] + srcp_below[i];
+ dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1)
- srcp_above2[i] - srcp_below2[i]) >> 3);
// Prevent over-sharpening:
// dst must not exceed src when the average of above and below
// is less than src. And the other way around.
- if (srcp_ab > srcp_x) {
+ if (src_ab > src_x) {
if (dstp[i] < srcp[i])
dstp[i] = srcp[i];
} else if (dstp[i] > srcp[i])
diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index 163ab7c184..f13791d254 100644
--- a/libavfilter/vf_tinterlace.c
+++ b/libavfilter/vf_tinterlace.c
@@ -133,19 +133,19 @@ static void lowpass_line_complex_c(uint8_t *dstp, ptrdiff_t width, const uint8_t
const uint8_t *srcp_below = srcp + pref;
const uint8_t *srcp_above2 = srcp + mref * 2;
const uint8_t *srcp_below2 = srcp + pref * 2;
- int i, srcp_x, srcp_ab;
+ int i, src_x, src_ab;
for (i = 0; i < width; i++) {
// this calculation is an integer representation of
// '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2'
// '4 +' is for rounding.
- srcp_x = srcp[i] << 1;
- srcp_ab = srcp_above[i] + srcp_below[i];
- dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1)
+ src_x = srcp[i] << 1;
+ src_ab = srcp_above[i] + srcp_below[i];
+ dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1)
- srcp_above2[i] - srcp_below2[i]) >> 3);
// Prevent over-sharpening:
// dst must not exceed src when the average of above and below
// is less than src. And the other way around.
- if (srcp_ab > srcp_x) {
+ if (src_ab > src_x) {
if (dstp[i] < srcp[i])
dstp[i] = srcp[i];
} else if (dstp[i] > srcp[i])
More information about the ffmpeg-cvslog
mailing list