Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/newview/VorbisFramework.h b/indra/newview/VorbisFramework.h
index 874a22fc30..7ee9a8c411 100644
--- a/indra/newview/VorbisFramework.h
+++ b/indra/newview/VorbisFramework.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file VorbisFramework.h
  * @author Dave Camp
  * @date Fri Oct 10 2003
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2003&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library 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;
  * version 2.1 of the License only.
- * 
+ *
  * This library 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
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -37,10 +37,10 @@ extern "C" {
 extern int      mac_vorbis_analysis(vorbis_block *vb,ogg_packet *op);
 
 extern int      mac_vorbis_analysis_headerout(vorbis_dsp_state *v,
-					  vorbis_comment *vc,
-					  ogg_packet *op,
-					  ogg_packet *op_comm,
-					  ogg_packet *op_code);
+                      vorbis_comment *vc,
+                      ogg_packet *op,
+                      ogg_packet *op_comm,
+                      ogg_packet *op_code);
 
 extern int mac_vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
 
@@ -49,12 +49,12 @@ extern int mac_vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
 extern int mac_vorbis_encode_setup_init(vorbis_info *vi);
 
 extern int mac_vorbis_encode_setup_managed(vorbis_info *vi,
-				       long channels,
-				       long rate,
-				       
-				       long max_bitrate,
-				       long nominal_bitrate,
-				       long min_bitrate);
+                       long channels,
+                       long rate,
+
+                       long max_bitrate,
+                       long nominal_bitrate,
+                       long min_bitrate);
 
 extern void     mac_vorbis_info_init(vorbis_info *vi);
 extern void     mac_vorbis_info_clear(vorbis_info *vi);
@@ -67,7 +67,7 @@ extern float  **mac_vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
 extern int      mac_vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
 extern int      mac_vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
 
-extern int		mac_ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
+extern int      mac_ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
 extern int      mac_ogg_stream_init(ogg_stream_state *os,int serialno);
 extern int      mac_ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
 extern int      mac_ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);