diff options
| author | ramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-12 20:47:32 +0000 |
|---|---|---|
| committer | ramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-12 20:47:32 +0000 |
| commit | 210601a9532c6ad92ea46596485e4387bd4b30eb (patch) | |
| tree | d104710fa8cf71d2d9fdd21ecc11c9da8d559fcd /libswscale/bfin | |
| parent | 8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff) | |
| download | mpv-210601a9532c6ad92ea46596485e4387bd4b30eb.tar.bz2 mpv-210601a9532c6ad92ea46596485e4387bd4b30eb.tar.xz | |
Revert r31153. It failed to build on:
x86_64 / Mac OS X gcc 4.0.1
x86_64 / Linux icc (all)
x86_64 / Linux gcc 4.0.4
x86_64 / OpenBSD gcc 3.3.5
x86_64 / Linux suncc 5.10
and there are some reports of crashes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31170 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/bfin')
| -rw-r--r-- | libswscale/bfin/internal_bfin.S | 8 | ||||
| -rw-r--r-- | libswscale/bfin/swscale_bfin.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S index cb8d71253c..5af46540a8 100644 --- a/libswscale/bfin/internal_bfin.S +++ b/libswscale/bfin/internal_bfin.S @@ -466,8 +466,8 @@ DEFUN_END(yuv2rgb24_line) #define ARG_srcStride 40 DEFUN(uyvytoyv12, mL3, (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, - int width, int height, - int lumStride, int chromStride, int srcStride)): + long width, long height, + long lumStride, long chromStride, long srcStride)): link 0; [--sp] = (r7:4,p5:4); @@ -539,8 +539,8 @@ DEFUN(uyvytoyv12, mL3, (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8 DEFUN_END(uyvytoyv12) DEFUN(yuyvtoyv12, mL3, (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, - int width, int height, - int lumStride, int chromStride, int srcStride)): + long width, long height, + long lumStride, long chromStride, long srcStride)): link 0; [--sp] = (r7:4,p5:4); diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 6c64d143a9..ce2f1720dd 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -38,12 +38,12 @@ #endif int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, - int width, int height, - int lumStride, int chromStride, int srcStride) L1CODE; + long width, long height, + long lumStride, long chromStride, long srcStride) L1CODE; int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, - int width, int height, - int lumStride, int chromStride, int srcStride) L1CODE; + long width, long height, + long lumStride, long chromStride, long srcStride) L1CODE; static int uyvytoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) |