Commit 3fa4ff85 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

FourCC reordering for Audio

parent 900acf00
......@@ -252,7 +252,7 @@ static const struct
/*
* Audio Codecs
*/
/* WMA family */
{ VLC_CODEC_WMA1, CODEC_ID_WMAV1, AUDIO_ES },
{ VLC_CODEC_WMA2, CODEC_ID_WMAV2, AUDIO_ES },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
......@@ -270,8 +270,6 @@ static const struct
{ VLC_CODEC_RA_144, CODEC_ID_RA_144, AUDIO_ES },
{ VLC_CODEC_RA_288, CODEC_ID_RA_288, AUDIO_ES },
{ VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
{ VLC_CODEC_A52, CODEC_ID_AC3, AUDIO_ES },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 )
{ VLC_CODEC_EAC3, CODEC_ID_EAC3, AUDIO_ES },
......@@ -279,11 +277,9 @@ static const struct
{ VLC_CODEC_DTS, CODEC_ID_DTS, AUDIO_ES },
{ VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
{ VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
{ VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
{ VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
{ VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
{ VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
......@@ -291,6 +287,8 @@ static const struct
{ VLC_CODEC_DSICINAUDIO, CODEC_ID_DSICINAUDIO, AUDIO_ES },
{ VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
{ VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
{ VLC_CODEC_ADPCM_XA, CODEC_ID_ADPCM_XA, AUDIO_ES },
{ VLC_CODEC_ADPCM_ADX, CODEC_ID_ADPCM_ADX, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
......@@ -305,9 +303,8 @@ static const struct
{ VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
{ VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
{ VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
{ VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
{ VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
{ VLC_CODEC_QDM2, CODEC_ID_QDM2, AUDIO_ES },
......@@ -315,27 +312,18 @@ static const struct
{ VLC_CODEC_TTA, CODEC_ID_TTA, AUDIO_ES },
{ VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
{ VLC_CODEC_WAVPACK, CODEC_ID_WAVPACK, AUDIO_ES },
{ VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
{ VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
{ VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES },
{ VLC_CODEC_SONIC, CODEC_ID_SONIC, AUDIO_ES },
{ VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES },
{ VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES },
{ VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES },
{ VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 )
{ VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 )
{ VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 )
{ VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
#endif
......@@ -346,6 +334,23 @@ static const struct
{ VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
#endif
/* Lossless */
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
{ VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
{ VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
{ VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 )
{ VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 )
{ VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
#endif
/* PCM */
{ VLC_CODEC_S8, CODEC_ID_PCM_S8, AUDIO_ES },
{ VLC_CODEC_U8, CODEC_ID_PCM_U8, AUDIO_ES },
......
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