libvorbis: use float input instead of s16

[ffmpeg] / libavcodec / wmv2.h

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 2fd842e6a2d61c6181cba02e4030717faf310d25..80f36ccddbc70ee6e1f7323d85ce74591c01b3f2 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -1,25 +1,25 @@
 /*
- * Copyright (c) 2002 The FFmpeg Project.
+ * Copyright (c) 2002 The Libav Project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_WMV2_H
-#define FFMPEG_WMV2_H
+#ifndef AVCODEC_WMV2_H
+#define AVCODEC_WMV2_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -50,9 +50,9 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]);
+    DECLARE_ALIGNED(16, DCTELEM, abt_block2)[6][64];
 }Wmv2Context;
 
 void ff_wmv2_common_init(Wmv2Context * w);
 
-#endif /* FFMPEG_WMV2_H */
+#endif /* AVCODEC_WMV2_H */