← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-updates

« back to all changes in this revision

Viewing changes to libswscale/rgb2rgb.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-02-05 21:45:05 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090205214505-fvn0jkiv3lrkaaq4
Tags: 3:0.svn20090204-2ubuntu1+unstripped1
rebuild using a clean, uncrippled ffmpeg tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswscale/rgb2rgb.c
139
139
//plain C versions
140
140
#undef HAVE_MMX
141
141
#undef HAVE_MMX2
142
 
#undef HAVE_3DNOW
 
142
#undef HAVE_AMD3DNOW
143
143
#undef HAVE_SSE2
144
144
#define HAVE_MMX 0
145
145
#define HAVE_MMX2 0
146
 
#define HAVE_3DNOW 0
 
146
#define HAVE_AMD3DNOW 0
147
147
#define HAVE_SSE2 0
148
148
#define RENAME(a) a ## _C
149
149
#include "rgb2rgb_template.c"
167
167
//3DNOW versions
168
168
#undef RENAME
169
169
#undef HAVE_MMX2
170
 
#undef HAVE_3DNOW
 
170
#undef HAVE_AMD3DNOW
171
171
#define HAVE_MMX2 0
172
 
#define HAVE_3DNOW 1
 
172
#define HAVE_AMD3DNOW 1
173
173
#define RENAME(a) a ## _3DNOW
174
174
#include "rgb2rgb_template.c"
175
175
 
183
183
*/
184
184
 
185
185
void sws_rgb2rgb_init(int flags){
186
 
#if (HAVE_MMX2 || HAVE_3DNOW || HAVE_MMX)  && CONFIG_GPL
 
186
#if (HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX)  && CONFIG_GPL
187
187
    if (flags & SWS_CPU_CAPS_MMX2)
188
188
        rgb2rgb_init_MMX2();
189
189
    else if (flags & SWS_CPU_CAPS_3DNOW)
191
191
    else if (flags & SWS_CPU_CAPS_MMX)
192
192
        rgb2rgb_init_MMX();
193
193
    else
194
 
#endif /* HAVE_MMX2 || HAVE_3DNOW || HAVE_MMX */
 
194
#endif /* HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX */
195
195
        rgb2rgb_init_C();
196
196
}
197
197