[FFmpeg-cvslog] huffyuvencdsp: Use intptr_t for width
Timothy Gu
git at videolan.org
Tue Oct 20 01:57:39 CEST 2015
ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Mon Oct 19 02:12:28 2015 +0100| [068e6cb73205d08ed76befd43dbd8b5a17ff3b22] | committer: Timothy Gu
huffyuvencdsp: Use intptr_t for width
It is done this way in huffyuvdsp as well.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=068e6cb73205d08ed76befd43dbd8b5a17ff3b22
---
libavcodec/huffyuvencdsp.c | 4 ++--
libavcodec/huffyuvencdsp.h | 4 ++--
libavcodec/x86/huffyuvencdsp_mmx.c | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c
index 95fcc19..fdcd0b0 100644
--- a/libavcodec/huffyuvencdsp.c
+++ b/libavcodec/huffyuvencdsp.c
@@ -25,7 +25,7 @@
#define pb_7f (~0UL / 255 * 0x7f)
#define pb_80 (~0UL / 255 * 0x80)
-static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w)
+static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, intptr_t w)
{
long i;
@@ -54,7 +54,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
}
static void sub_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1,
- const uint8_t *src2, int w,
+ const uint8_t *src2, intptr_t w,
int *left, int *left_top)
{
int i;
diff --git a/libavcodec/huffyuvencdsp.h b/libavcodec/huffyuvencdsp.h
index 3a49b4a..9d09095 100644
--- a/libavcodec/huffyuvencdsp.h
+++ b/libavcodec/huffyuvencdsp.h
@@ -25,13 +25,13 @@ typedef struct HuffYUVEncDSPContext {
void (*diff_bytes)(uint8_t *dst /* align 16 */,
const uint8_t *src1 /* align 16 */,
const uint8_t *src2 /* align 1 */,
- int w);
+ intptr_t w);
/**
* Subtract HuffYUV's variant of median prediction.
* Note, this might read from src1[-1], src2[-1].
*/
void (*sub_hfyu_median_pred)(uint8_t *dst, const uint8_t *src1,
- const uint8_t *src2, int w,
+ const uint8_t *src2, intptr_t w,
int *left, int *left_top);
} HuffYUVEncDSPContext;
diff --git a/libavcodec/x86/huffyuvencdsp_mmx.c b/libavcodec/x86/huffyuvencdsp_mmx.c
index 63d8e3c..ee60f4c 100644
--- a/libavcodec/x86/huffyuvencdsp_mmx.c
+++ b/libavcodec/x86/huffyuvencdsp_mmx.c
@@ -31,7 +31,8 @@
#if HAVE_INLINE_ASM
-static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w)
+static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
+ intptr_t w)
{
x86_reg i = 0;
@@ -57,7 +58,7 @@ static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src
}
static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1,
- const uint8_t *src2, int w,
+ const uint8_t *src2, intptr_t w,
int *left, int *left_top)
{
x86_reg i = 0;
More information about the ffmpeg-cvslog
mailing list