Skip to content

V
vlc-gpu
Commit a14d22e1 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Disable MMXEXT (MMX2) mode for swScaler since it crashes.

parent 0bb30cd1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/codec/ffmpeg/scale.c
View file @ a14d22e1
...@@ -111,7 +111,6 @@ int E_(OpenScaler)( vlc_object_t *p_this ) ...@@ -111,7 +111,6 @@ int E_(OpenScaler)( vlc_object_t *p_this )
} }
swscale_fast_memcpy = p_filter->p_libvlc->pf_memcpy; swscale_fast_memcpy = p_filter->p_libvlc->pf_memcpy;
/* Set CPU capabilities */ /* Set CPU capabilities */
i_cpu = vlc_CPU(); i_cpu = vlc_CPU();
p_sys->i_cpu_mask = 0; p_sys->i_cpu_mask = 0;
...@@ -119,10 +118,12 @@ int E_(OpenScaler)( vlc_object_t *p_this ) ...@@ -119,10 +118,12 @@ int E_(OpenScaler)( vlc_object_t *p_this )
{ {
p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX; p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX;
} }
#if 0
if( i_cpu & CPU_CAPABILITY_MMXEXT ) if( i_cpu & CPU_CAPABILITY_MMXEXT )
{ {
p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX2; p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX2;
} }
#endif
if( i_cpu & CPU_CAPABILITY_3DNOW ) if( i_cpu & CPU_CAPABILITY_3DNOW )
{ {
p_sys->i_cpu_mask |= SWS_CPU_CAPS_3DNOW; p_sys->i_cpu_mask |= SWS_CPU_CAPS_3DNOW;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment