diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-11-26 00:09:07 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-11-26 00:09:07 +0400 |
| commit | 0d50c617a34f66904a4880a7d5bda3cba9b12df1 (patch) | |
| tree | 9f495f9d849a6bf6c3c297a544242fa911238a6f /demuxer | |
| parent | 44f68f00bb2dd303b2abfd446b383fb6de5db890 (diff) | |
Include wmcodecdsp.h and remove any duplicate GUID definitions
Diffstat (limited to 'demuxer')
| -rw-r--r-- | demuxer/Demuxers/LAVFAudioHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demuxer/Demuxers/LAVFAudioHelper.cpp b/demuxer/Demuxers/LAVFAudioHelper.cpp index 132ca480..5c577dd8 100644 --- a/demuxer/Demuxers/LAVFAudioHelper.cpp +++ b/demuxer/Demuxers/LAVFAudioHelper.cpp @@ -48,7 +48,7 @@ static FormatMapping audio_map[] = { { AV_CODEC_ID_PCM_S24LE, &MEDIASUBTYPE_PCM, WAVE_FORMAT_PCM, NULL }, { AV_CODEC_ID_PCM_S32LE, &MEDIASUBTYPE_PCM, WAVE_FORMAT_PCM, NULL }, { AV_CODEC_ID_PCM_F32LE, &MEDIASUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, NULL }, - { AV_CODEC_ID_WMAV1, &MEDIASUBTYPE_WMAUDIO1, WAVE_FORMAT_MSAUDIO1, NULL }, + { AV_CODEC_ID_WMAV1, &MEDIASUBTYPE_MSAUDIO1, WAVE_FORMAT_MSAUDIO1, NULL }, { AV_CODEC_ID_WMAV2, &MEDIASUBTYPE_WMAUDIO2, WAVE_FORMAT_WMAUDIO2, NULL }, { AV_CODEC_ID_WMAPRO, &MEDIASUBTYPE_WMAUDIO3, WAVE_FORMAT_WMAUDIO3, NULL }, { AV_CODEC_ID_ADPCM_IMA_AMV, &MEDIASUBTYPE_IMA_AMV, NULL, NULL }, |