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

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 0fdf690f869bbd074ad54cc8ddfb4136fce597d7..f2b8daffc8c4aeefa2406fd16c63dcc5ee306540 100644 (file)
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -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" }
 };
 

diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index 34e4b4c6c95614e0da9bf4711291d597c4fb3a48..b8064efa544f5a7e8b151978e91bf74aad11317e 100644 (file)
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -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'):

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index d2be17416a04bafa05c056ef544792029dfa4914..6aefc9244e72eed87f3666642a175cb05dcb8447 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -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;

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 9b6073b11820f2e3d708209cd5da71053f981087..e391260a9627062c0780b6628fd871b400ff376a 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -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 )
         {