Audio: do not hardcode audio channel limits into the decoder/demuxer

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
11 years ago · 18a7aaca6e
3 changed files with 5 additions and 5 deletions
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@ -246,8 +246,8 @@ static int DecoderOpen( vlc_object_t *p_this )
    if( p_dec->fmt_in.audio.i_channels <= 0 ||
        p_dec->fmt_in.audio.i_channels > AOUT_CHAN_MAX )
    {
-        msg_Err( p_dec, "bad channels count (1-9): %i",
-                 p_dec->fmt_in.audio.i_channels );
+        msg_Err( p_dec, "bad channels count (1-%i): %i",
+                 AOUT_CHAN_MAX, p_dec->fmt_in.audio.i_channels );
        return VLC_EGENERIC;
    }

--- a/modules/codec/g711.c
+++ b/modules/codec/g711.c
@ -162,8 +162,8 @@ static int DecoderOpen( vlc_object_t *p_this )
    if( p_dec->fmt_in.audio.i_channels <= 0 ||
        p_dec->fmt_in.audio.i_channels > AOUT_CHAN_MAX )
    {
-        msg_Err( p_dec, "bad channels count (1-9): %i",
-                 p_dec->fmt_in.audio.i_channels );
+        msg_Err( p_dec, "bad channels count (1-%i): %i",
+                 AOUT_CHAN_MAX, p_dec->fmt_in.audio.i_channels );
        return VLC_EGENERIC;
    }

--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@ -272,7 +272,7 @@ static int Open( vlc_object_t * p_this )
        }
    }
    else if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_PCM &&
-             p_sys->fmt.audio.i_channels > 2 && p_sys->fmt.audio.i_channels <= 9 )
+             p_sys->fmt.audio.i_channels > 2 && p_sys->fmt.audio.i_channels <= AOUT_CHAN_MAX )
    {
        for( int i = 0; i < p_sys->fmt.audio.i_channels; i++ )
            p_sys->i_channel_mask |= pi_channels_aout[i];