Silence some CMake build MSVC useless warnings

[platform/upstream/libvorbis.git] / lib / modes / setup_22.h

diff --git a/lib/modes/setup_22.h b/lib/modes/setup_22.h
index f5e01d2..bc38af9 100644 (file)
--- a/lib/modes/setup_22.h
+++ b/lib/modes/setup_22.h
@@ -11,7 +11,6 @@
  ********************************************************************
 
  function: 22kHz settings
- last mod: $Id$
 
  ********************************************************************/
 
@@ -52,8 +51,8 @@ static const ve_setup_data_template ve_setup_22_stereo={
   _psy_noise_suppress,
 
   _psy_compand_8,
-  _psy_compand_8_mapping,
-  _psy_compand_8_mapping,
+  _psy_compand_16_mapping,
+  _psy_compand_16_mapping,
 
   {_noise_start_16,_noise_start_16},
   { _noise_part_16, _noise_part_16},
@@ -70,7 +69,7 @@ static const ve_setup_data_template ve_setup_22_stereo={
 
   _floor_books,
   _floor,
-  _floor_mapping_16_short,
+  2,
   _floor_mapping_16,
 
   _mapres_template_16_stereo
@@ -103,8 +102,8 @@ static const ve_setup_data_template ve_setup_22_uncoupled={
   _psy_noise_suppress,
 
   _psy_compand_8,
-  _psy_compand_8_mapping,
-  _psy_compand_8_mapping,
+  _psy_compand_16_mapping,
+  _psy_compand_16_mapping,
 
   {_noise_start_16,_noise_start_16},
   { _noise_part_16, _noise_part_16},
@@ -121,7 +120,7 @@ static const ve_setup_data_template ve_setup_22_uncoupled={
 
   _floor_books,
   _floor,
-  _floor_mapping_16_short,
+  2,
   _floor_mapping_16,
 
   _mapres_template_16_uncoupled