← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/mux/wav.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/mux/wav.c
2
2
 * wav.c: wav muxer module for vlc
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2004, 2006 the VideoLAN team
5
 
 * $Id: 7a8968f08fa78b657a10657e4dc893476e0af4d7 $
 
5
 * $Id: f2f4091d78f7d7334659ed5d49875f33a214af03 $
6
6
 *
7
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
8
8
 *
204
204
                 p_sys->i_channel_mask, (int)p_sys->b_chan_reorder );
205
205
    }
206
206
 
207
 
    i_format = p_input->p_fmt->i_codec == VLC_FOURCC('f', 'l', '3', '2') ?
 
207
    i_format = p_input->p_fmt->i_codec == VLC_CODEC_FL32 ?
208
208
        WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM;
209
209
    b_ext = p_sys->b_ext = p_input->p_fmt->audio.i_channels > 2;
210
210