diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /mp3lib/sr1.c | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'mp3lib/sr1.c')
| -rw-r--r-- | mp3lib/sr1.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 3b3a2af204..0dacec0156 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -408,34 +408,34 @@ void MP3_Init(void){ #if HAVE_MMX if (gCpuCaps.hasMMX) { - _has_mmx = 1; - synth_func = synth_1to1_MMX; + _has_mmx = 1; + synth_func = synth_1to1_MMX; } #endif #if HAVE_AMD3DNOWEXT if (gCpuCaps.has3DNowExt) { - dct36_func=dct36_3dnowex; - dct64_MMX_func= dct64_MMX_3dnowex; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n"); + dct36_func=dct36_3dnowex; + dct64_MMX_func= dct64_MMX_3dnowex; + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n"); } else #endif #if HAVE_AMD3DNOW if (gCpuCaps.has3DNow) { - dct36_func = dct36_3dnow; - dct64_MMX_func = dct64_MMX_3dnow; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n"); + dct36_func = dct36_3dnow; + dct64_MMX_func = dct64_MMX_3dnow; + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n"); } else #endif #if HAVE_SSE if (gCpuCaps.hasSSE) { - dct64_MMX_func = dct64_sse; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n"); + dct64_MMX_func = dct64_sse; + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n"); } else #endif @@ -443,28 +443,28 @@ void MP3_Init(void){ #if HAVE_MMX if (gCpuCaps.hasMMX) { - dct64_MMX_func = dct64_MMX; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n"); + dct64_MMX_func = dct64_MMX; + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n"); } else #endif if (gCpuCaps.cpuType >= CPUTYPE_I586) { - synth_func = synth_1to1_pent; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using Pentium optimized decore!\n"); + synth_func = synth_1to1_pent; + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using Pentium optimized decore!\n"); } else #endif /* ARCH_X86_32 */ #if HAVE_ALTIVEC if (gCpuCaps.hasAltiVec) { - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using AltiVec optimized decore!\n"); + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using AltiVec optimized decore!\n"); } else #endif { - synth_func = NULL; /* use default c version */ - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n"); + synth_func = NULL; /* use default c version */ + mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n"); } #ifdef CONFIG_FAKE_MONO @@ -531,7 +531,7 @@ int MP3_DecodeFrame(unsigned char *hova,short single){ case 3: do_layer3(&fr,single);break; case 1: do_layer1(&fr,single);break; default: - return 0; // unsupported + return 0; // unsupported } // ++MP3_frames; return pcm_point ? pcm_point : 2; |