From 663421588415e89cd091b85098c97c85d942c1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Mon, 27 Jan 2014 21:33:36 +0200 Subject: Separate ATRAC series from Real Audio ATRAC is not a Real format, although its older versions are at times seen muxed in Real files. --- demuxer/Demuxers/LAVFAudioHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demuxer') diff --git a/demuxer/Demuxers/LAVFAudioHelper.cpp b/demuxer/Demuxers/LAVFAudioHelper.cpp index 26dcb0b2..d1fad410 100644 --- a/demuxer/Demuxers/LAVFAudioHelper.cpp +++ b/demuxer/Demuxers/LAVFAudioHelper.cpp @@ -54,8 +54,6 @@ static FormatMapping audio_map[] = { { AV_CODEC_ID_ADPCM_IMA_AMV, &MEDIASUBTYPE_IMA_AMV, 0, nullptr }, { AV_CODEC_ID_FLAC, &MEDIASUBTYPE_FLAC_FRAMED, WAVE_FORMAT_FLAC, nullptr }, { AV_CODEC_ID_COOK, &MEDIASUBTYPE_COOK, WAVE_FORMAT_COOK, nullptr }, - { AV_CODEC_ID_ATRAC1, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, - { AV_CODEC_ID_ATRAC3, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, { AV_CODEC_ID_SIPR, &MEDIASUBTYPE_SIPR, WAVE_FORMAT_SIPR, nullptr }, { AV_CODEC_ID_RA_288, &MEDIASUBTYPE_28_8, WAVE_FORMAT_28_8, nullptr }, { AV_CODEC_ID_RA_144, &MEDIASUBTYPE_14_4, WAVE_FORMAT_14_4, nullptr }, @@ -75,6 +73,8 @@ static FormatMapping audio_map[] = { { AV_CODEC_ID_PCM_S24BE, &MEDIASUBTYPE_PCM_IN24, 0, nullptr }, { AV_CODEC_ID_PCM_S32BE, &MEDIASUBTYPE_PCM_IN32, 0, nullptr }, { AV_CODEC_ID_QDM2, &MEDIASUBTYPE_QDM2, WAVE_FORMAT_QDESIGN_MUSIC, nullptr }, + { AV_CODEC_ID_ATRAC1, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, + { AV_CODEC_ID_ATRAC3, &MEDIASUBTYPE_ATRC, WAVE_FORMAT_ATRC, nullptr }, }; CMediaType CLAVFAudioHelper::initAudioType(AVCodecID codecId, unsigned int &codecTag, std::string container) -- cgit v1.2.3