diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-16 03:53:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-16 03:53:58 +0200 |
| commit | 7a02527b05e2ae5ffab579062dbe3c888758335f (patch) | |
| tree | c52ec9666f9436a6c15df3c6b32d08d897771aba /libswscale/x86/rgb2rgb.c | |
| parent | a0bafaabb0656ca3bb3591beba0de79f6153fdac (diff) | |
| parent | b203f65451646b1555d458a3601159f7d89a3397 (diff) | |
| download | ffmpeg-7a02527b05e2ae5ffab579062dbe3c888758335f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: use correct alignment and length in channel coupling dsp functions.
ffmpeg: don't abuse a global for passing framerate from input to output
ffmpeg: don't abuse a global for passing channels from input to output
ffmpeg: don't abuse a global for passing samplerate from input to output
ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
swscale: use SwsContext for av_log when available
swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
swscale: Fix compilation with --disable-mmx2.
Conflicts:
ffmpeg.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/rgb2rgb.c')
| -rw-r--r-- | libswscale/x86/rgb2rgb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 78b804e367..ed7f5adb74 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -127,7 +127,7 @@ void rgb2rgb_init_x86(void) { int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) + if (cpu_flags & AV_CPU_FLAG_MMX) rgb2rgb_init_MMX(); if (HAVE_AMD3DNOW && cpu_flags & AV_CPU_FLAG_3DNOW) rgb2rgb_init_3DNOW(); |