dummy support for mpeg2 non linear quant

[ffmpeg] / libavcodec / fft.c

diff --git a/libavcodec/fft.c b/libavcodec/fft.c
index bc514724c0a3ed9968d5989190d39a62b69ef7c3..62a6a557619cd9b3527f23bfa9a0bd81d91feed8 100644 (file)
--- a/libavcodec/fft.c
+++ b/libavcodec/fft.c
@@ -2,18 +2,20 @@
  * FFT/IFFT transforms
  * Copyright (c) 2002 Fabrice Bellard.
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -65,21 +67,18 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse)
 
         if (has_vectors) {
 #if defined(HAVE_MMX)
-            if (has_vectors & MM_3DNOWEXT)
+            if (has_vectors & MM_3DNOWEXT) {
+                /* 3DNowEx for K7/K8 */
                 s->imdct_calc = ff_imdct_calc_3dn2;
-            if (has_vectors & MM_3DNOWEXT)
-                /* 3DNowEx for Athlon(XP) */
                 s->fft_calc = ff_fft_calc_3dn2;
-            else if (has_vectors & MM_3DNOW)
+            } else if (has_vectors & MM_3DNOW) {
                 /* 3DNow! for K6-2/3 */
                 s->fft_calc = ff_fft_calc_3dn;
-            if (has_vectors & MM_SSE2)
-                /* SSE for P4/K8 */
-                s->fft_calc = ff_fft_calc_sse;
-            else if ((has_vectors & MM_SSE) &&
-                     s->fft_calc == ff_fft_calc_c)
-                /* SSE for P3 */
+            } else if (has_vectors & MM_SSE) {
+                /* SSE for P3/P4 */
+                s->imdct_calc = ff_imdct_calc_sse;
                 s->fft_calc = ff_fft_calc_sse;
+            }
 #else /* HAVE_MMX */
             if (has_vectors & MM_ALTIVEC)
                 s->fft_calc = ff_fft_calc_altivec;