[FFmpeg-cvslog] avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions
Michael Niedermayer
git at videolan.org
Sat Jul 26 03:21:05 CEST 2014
ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 25 17:49:03 2014 +0200| [0f09436a43299f714c5fa287f3b110de4e0aae6e] | committer: Michael Niedermayer
avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions
This should avoid issues on x86_64
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6dffc8f5aaab6b20385f0a0d9ef95cec7d6cdd4b)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f09436a43299f714c5fa287f3b110de4e0aae6e
---
libavfilter/vf_pullup.c | 8 ++++----
libavfilter/vf_pullup.h | 6 +++---
libavfilter/x86/vf_pullup_init.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c
index 80f448b..7c65852 100644
--- a/libavfilter/vf_pullup.c
+++ b/libavfilter/vf_pullup.c
@@ -69,7 +69,7 @@ static int query_formats(AVFilterContext *ctx)
#define ABS(a) (((a) ^ ((a) >> 31)) - ((a) >> 31))
-static int diff_c(const uint8_t *a, const uint8_t *b, int s)
+static int diff_c(const uint8_t *a, const uint8_t *b, ptrdiff_t s)
{
int i, j, diff = 0;
@@ -83,7 +83,7 @@ static int diff_c(const uint8_t *a, const uint8_t *b, int s)
return diff;
}
-static int comb_c(const uint8_t *a, const uint8_t *b, int s)
+static int comb_c(const uint8_t *a, const uint8_t *b, ptrdiff_t s)
{
int i, j, comb = 0;
@@ -98,7 +98,7 @@ static int comb_c(const uint8_t *a, const uint8_t *b, int s)
return comb;
}
-static int var_c(const uint8_t *a, const uint8_t *b, int s)
+static int var_c(const uint8_t *a, const uint8_t *b, ptrdiff_t s)
{
int i, j, var = 0;
@@ -510,7 +510,7 @@ static void pullup_release_frame(PullupFrame *f)
static void compute_metric(PullupContext *s, int *dest,
PullupField *fa, int pa, PullupField *fb, int pb,
- int (*func)(const uint8_t *, const uint8_t *, int))
+ int (*func)(const uint8_t *, const uint8_t *, ptrdiff_t))
{
int mp = s->metric_plane;
int xstep = 8;
diff --git a/libavfilter/vf_pullup.h b/libavfilter/vf_pullup.h
index 3213b4d..8f59335 100644
--- a/libavfilter/vf_pullup.h
+++ b/libavfilter/vf_pullup.h
@@ -61,9 +61,9 @@ typedef struct PullupContext {
PullupBuffer buffers[10];
PullupFrame frame;
- int (*diff)(const uint8_t *a, const uint8_t *b, int s);
- int (*comb)(const uint8_t *a, const uint8_t *b, int s);
- int (*var )(const uint8_t *a, const uint8_t *b, int s);
+ int (*diff)(const uint8_t *a, const uint8_t *b, ptrdiff_t s);
+ int (*comb)(const uint8_t *a, const uint8_t *b, ptrdiff_t s);
+ int (*var )(const uint8_t *a, const uint8_t *b, ptrdiff_t s);
} PullupContext;
void ff_pullup_init_x86(PullupContext *s);
diff --git a/libavfilter/x86/vf_pullup_init.c b/libavfilter/x86/vf_pullup_init.c
index 9948abf..5b36b68 100644
--- a/libavfilter/x86/vf_pullup_init.c
+++ b/libavfilter/x86/vf_pullup_init.c
@@ -23,9 +23,9 @@
#include "libavutil/x86/cpu.h"
#include "libavfilter/vf_pullup.h"
-int ff_pullup_filter_diff_mmx(const uint8_t *a, const uint8_t *b, int s);
-int ff_pullup_filter_comb_mmx(const uint8_t *a, const uint8_t *b, int s);
-int ff_pullup_filter_var_mmx (const uint8_t *a, const uint8_t *b, int s);
+int ff_pullup_filter_diff_mmx(const uint8_t *a, const uint8_t *b, ptrdiff_t s);
+int ff_pullup_filter_comb_mmx(const uint8_t *a, const uint8_t *b, ptrdiff_t s);
+int ff_pullup_filter_var_mmx (const uint8_t *a, const uint8_t *b, ptrdiff_t s);
av_cold void ff_pullup_init_x86(PullupContext *s)
{
More information about the ffmpeg-cvslog
mailing list