RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FLAT objects cannot have multiple sections, so using the L1 attributes breaks 

linking. The FDPIC relocs also break for any other format. Thus check the
compiler environment and select the appropriate sections/relocs.
patch by Mike Frysinger, vapier.adi a gmail d com

Originally committed as revision 26010 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Mike Frysinger 2008-02-16 15:17:59 +00:00 committed by Diego Biurrun
parent e44d7c659b
commit d2a4ecafbb
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/internal_bfin.S
View File

@ -94,8 +94,12 @@
*/ */
#define mL1 .l1.text
#define mL3 .text #define mL3 .text
#ifdef __FDPIC__
#define mL1 .l1.text
#else
#define mL1 mL3
#endif
#define MEM mL1 #define MEM mL1
#define DEFUN(fname,where,interface) \ #define DEFUN(fname,where,interface) \

9
libswscale/swscale_bfin.c
View File

@ -34,14 +34,19 @@
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
#ifdef __FDPIC__
#define L1CODE __attribute__ ((l1_text))
#else
#define L1CODE
#endif
extern int ff_bfin_uyvytoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, extern int ff_bfin_uyvytoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
long width, long height, long width, long height,
long lumStride, long chromStride, long srcStride) __attribute__ ((l1_text)); long lumStride, long chromStride, long srcStride) L1CODE;
extern int ff_bfin_yuyvtoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, extern int ff_bfin_yuyvtoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
long width, long height, long width, long height,
long lumStride, long chromStride, long srcStride) __attribute__ ((l1_text)); long lumStride, long chromStride, long srcStride) L1CODE;
static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])

5
libswscale/yuv2rgb_bfin.c
View File

@ -36,8 +36,11 @@
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
#ifdef __FDPIC__
#define L1CODE __attribute__ ((l1_text)) #define L1CODE __attribute__ ((l1_text))
#else
#define L1CODE
#endif
extern void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, extern void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;