Mercurial > libavcodec.hg

changeset 7218:7f3d6509628b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix x86-64
author michael
date Mon, 07 Jul 2008 21:04:29 +0000
parents 726770da3234
children f72ef5b28253
files dsputil.c dsputil.h i386/dsputil_mmx.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dsputil.c	Mon Jul 07 20:46:03 2008 +0000
+++ b/dsputil.c	Mon Jul 07 21:04:29 2008 +0000
@@ -3930,7 +3930,7 @@
         dst[i*step] = src0[i] * src1[i] + src2[i] + src3;
 }
 
-void ff_float_to_int16_c(int16_t *dst, const float *src, int len){
+void ff_float_to_int16_c(int16_t *dst, const float *src, long len){
     int i;
     for(i=0; i<len; i++) {
         int_fast32_t tmp = ((const int32_t*)src)[i];
--- a/dsputil.h	Mon Jul 07 20:46:03 2008 +0000
+++ b/dsputil.h	Mon Jul 07 21:04:29 2008 +0000
@@ -63,7 +63,7 @@
 
 void ff_vector_fmul_add_add_c(float *dst, const float *src0, const float *src1,
                               const float *src2, int src3, int blocksize, int step);
-void ff_float_to_int16_c(int16_t *dst, const float *src, int len);
+void ff_float_to_int16_c(int16_t *dst, const float *src, long len);
 
 /* encoding scans */
 extern const uint8_t ff_alternate_horizontal_scan[64];
@@ -367,7 +367,7 @@
 
     /* C version: convert floats from the range [384.0,386.0] to ints in [-32768,32767]
      * simd versions: convert floats from [-32768.0,32767.0] without rescaling and arrays are 16byte aligned */
-    void (*float_to_int16)(int16_t *dst, const float *src, int len);
+    void (*float_to_int16)(int16_t *dst, const float *src, long len);
 
     /* (I)DCT */
     void (*fdct)(DCTELEM *block/* align 16*/);
--- a/i386/dsputil_mmx.c	Mon Jul 07 20:46:03 2008 +0000
+++ b/i386/dsputil_mmx.c	Mon Jul 07 21:04:29 2008 +0000
@@ -2022,7 +2022,7 @@
         ff_vector_fmul_add_add_c(dst, src0, src1, src2, src3, len, step);
 }
 
-static void float_to_int16_3dnow(int16_t *dst, const float *src, int len){
+static void float_to_int16_3dnow(int16_t *dst, const float *src, long len){
     // not bit-exact: pf2id uses different rounding than C and SSE
     asm volatile(
         "add        %0          , %0        \n\t"
@@ -2044,7 +2044,7 @@
         :"+r"(len), "+r"(dst), "+r"(src)
     );
 }
-static void float_to_int16_sse(int16_t *dst, const float *src, int len){
+static void float_to_int16_sse(int16_t *dst, const float *src, long len){
     int i;
     for(i=0; i<len; i+=4) {
         asm volatile(