voutqt.m: use kYUVSPixelFormat for MacIntel CPUs

[vlc] / modules / audio_filter / format.c

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index 109c64b8303315c6693f2fced88609454602e073..dec29f62835ef5879fca00b29cd3936945da88c0 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * format.c : PCM format converter
  *****************************************************************************
- * Copyright (C) 2002-2005 VideoLAN
+ * Copyright (C) 2002-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -198,7 +198,9 @@ static struct
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("audio filter for PCM format conversion") );
+    set_description( _("Audio filter for PCM format conversion") );
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
     set_capability( "audio filter2", 1 );
     set_callbacks( Open, NULL );
 vlc_module_end();
@@ -220,8 +222,9 @@ static int Open( vlc_object_t *p_this )
     if( ConvertTable[i].pf_convert == NULL )
         return VLC_EGENERIC;
 
-    
     p_filter->pf_audio_filter = ConvertTable[i].pf_convert;
+    p_filter->fmt_out.audio = p_filter->fmt_in.audio;
+    p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
 
     msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
              (char *)&p_filter->fmt_in.i_codec,