diff options
| author | Zuxy Meng <zuxy.meng@gmail.com> | 2010-01-11 08:21:31 +0000 |
|---|---|---|
| committer | Zuxy Meng <zuxy.meng@gmail.com> | 2010-01-11 08:21:31 +0000 |
| commit | 52c0fcaf52148b17c883fcc255828884b23368d3 (patch) | |
| tree | b7cf1e077a6cc9c7e822ea1ba3d9d2ee58462fb4 | |
| parent | 996de2fefa999c9934c0ae2195574bdb46de2c3e (diff) | |
| download | ffmpeg-52c0fcaf52148b17c883fcc255828884b23368d3.tar.gz | |
Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for
multiple times.
Originally committed as revision 30273 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/x86/yuv2rgb_template.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c index b000dd2574..b6a1c3dca9 100644 --- a/libswscale/x86/yuv2rgb_template.c +++ b/libswscale/x86/yuv2rgb_template.c @@ -295,6 +295,7 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr YUV2RGB_OPERANDS } +#undef RGB_PLANAR2PACKED24 #if HAVE_MMX2 #define RGB_PLANAR2PACKED24(red, blue)\ "movq "MANGLE(ff_M24A)", %%mm4 \n\t"\ |