Commit 613bbb83 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove "pcm " pseudo-codec, synonymous with "araw"

parent 0e4586e3
......@@ -433,7 +433,7 @@ static const struct
}
sub_format_tag_to_fourcc[] =
{
{ _KSDATAFORMAT_SUBTYPE_PCM_, VLC_FOURCC( 'p', 'c', 'm', ' ' ), "PCM" },
{ _KSDATAFORMAT_SUBTYPE_PCM_, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "PCM" },
{ _KSDATAFORMAT_SUBTYPE_UNKNOWN_, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
};
......
......@@ -111,7 +111,6 @@ static int DecoderOpen( vlc_object_t *p_this )
switch( p_dec->fmt_in.i_codec )
{
case VLC_FOURCC('a','r','a','w'):
case VLC_FOURCC('p','c','m',' '):
case VLC_FOURCC('a','f','l','t'):
/* _signed_ big endian samples (mov) */
case VLC_FOURCC('t','w','o','s'):
......
......@@ -268,7 +268,6 @@ static int Open( vlc_object_t * p_this )
if( p_sys->i_channel_mask )
{
if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
p_sys->fmt.i_codec == VLC_FOURCC('p','c','m',' ') ||
p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
p_sys->i_chans_to_reorder =
aout_CheckChannelReorder( pi_channels_in, NULL,
......@@ -312,7 +311,6 @@ static int Open( vlc_object_t * p_this )
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
case VLC_CODEC_ALAW:
case VLC_CODEC_MULAW:
case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
if( FrameInfo_PCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
......
......@@ -1513,8 +1513,7 @@ vlc_fourcc_t vlc_fourcc_GetCodecAudio( vlc_fourcc_t i_fourcc, int i_bits )
return 0;
}
}
else if( i_fourcc == VLC_FOURCC( 'a', 'r', 'a', 'w' ) ||
i_fourcc == VLC_FOURCC( 'p', 'c', 'm', ' ' ) )
else if( i_fourcc == VLC_FOURCC( 'a', 'r', 'a', 'w' ) )
{
switch( i_bytes )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment