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

Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7' 

* commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7':
  x86: Consistently use cpu flag detection macros in places that still miss it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-14 14:44:53 +01:00
parent 7766c7b7a0 46bacb5cc6
commit b148a39d55
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/mpegaudiodsp.c
View File

@ -252,7 +252,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
}
#if HAVE_SSE2_INLINE
if (cpu_flags & AV_CPU_FLAG_SSE2) {
if (INLINE_SSE2(cpu_flags)) {
s->apply_window_float = apply_window_mp3;
}
#endif /* HAVE_SSE2_INLINE */

4
libswscale/x86/swscale.c
View File

@ -382,11 +382,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
int cpu_flags = av_get_cpu_flags();
#if HAVE_MMX_INLINE
if (cpu_flags & AV_CPU_FLAG_MMX)
if (INLINE_MMX(cpu_flags))
sws_init_swscale_mmx(c);
#endif
#if HAVE_MMXEXT_INLINE
if (cpu_flags & AV_CPU_FLAG_MMXEXT)
if (INLINE_MMXEXT(cpu_flags))
sws_init_swscale_mmxext(c);
if (cpu_flags & AV_CPU_FLAG_SSE3){
if(c->use_mmx_vfilter && !(c->flags & SWS_ACCURATE_RND))

5
libswscale/x86/yuv2rgb.c
View File

@ -34,6 +34,7 @@
#include "libswscale/swscale_internal.h"
#include "libavutil/attributes.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/cpu.h"
#if HAVE_INLINE_ASM
@ -74,7 +75,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
int cpu_flags = av_get_cpu_flags();
#if HAVE_MMXEXT_INLINE
if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
if (INLINE_MMXEXT(cpu_flags)) {
switch (c->dstFormat) {
case AV_PIX_FMT_RGB24:
return yuv420_rgb24_mmxext;
@ -84,7 +85,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
}
#endif
if (cpu_flags & AV_CPU_FLAG_MMX) {
if (INLINE_MMX(cpu_flags)) {
switch (c->dstFormat) {
case AV_PIX_FMT_RGB32:
if (c->srcFormat == AV_PIX_FMT_YUVA420P) {