[vlc-commits] Fix truespeech in wav files

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug  9 12:16:09 2012 +0200| [c9118e87013c5329c556fb5f76145a3cd790d93c] | committer: Jean-Baptiste Kempf

Fix truespeech in wav files

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c9118e87013c5329c556fb5f76145a3cd790d93c
---

 include/vlc_codecs.h |    2 +-
 modules/demux/wav.c  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 373adac..b4877f1 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -350,7 +350,7 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_MULAW,      VLC_CODEC_MULAW,                  "Mu-Law" },
     { WAVE_FORMAT_IMA_ADPCM,  VLC_CODEC_ADPCM_IMA_WAV,          "Ima-ADPCM" },
     { WAVE_FORMAT_YAMAHA_ADPCM, VLC_CODEC_ADPCM_YAMAHA,         "Yamaha ADPCM" },
-    { WAVE_FORMAT_TRUESPEECH, VLC_FOURCC(0x22, 0x0, 0x0, 0x0 ), "Truespeech" },
+    { WAVE_FORMAT_TRUESPEECH, VLC_CODEC_TRUESPEECH,             "Truespeech" },
     { WAVE_FORMAT_GSM610,     VLC_CODEC_GSM_MS,                 "Microsoft WAV GSM" },
     { WAVE_FORMAT_G726,       VLC_CODEC_ADPCM_G726,             "G.726 ADPCM" },
     { WAVE_FORMAT_MPEGLAYER3, VLC_CODEC_MPGA,                   "Mpeg Audio" },
diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 6909744..b3bbaca 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -341,6 +341,7 @@ static int Open( vlc_object_t * p_this )
         goto error;
     case VLC_CODEC_GSM_MS:
     case VLC_CODEC_ADPCM_G726:
+    case VLC_CODEC_TRUESPEECH:
         if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
                              &p_sys->fmt ) )
             goto error;