Mercurial > libavcodec.hg
changeset 6637:0557f6cc5ed0 libavcodec
cosmetics: Sort some lists alphabetically.
| author | diego |
|---|---|
| date | Thu, 17 Apr 2008 22:04:34 +0000 |
| parents | 43c97362dfa8 |
| children | cdc496faff19 |
| files | Makefile adpcm.c allcodecs.c pcm.c |
| diffstat | 4 files changed, 45 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Apr 17 21:57:52 2008 +0000 +++ b/Makefile Thu Apr 17 22:04:34 2008 +0000 @@ -233,41 +233,41 @@ OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o +OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_S32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S32BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_U24BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_U24BE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_U24LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_U24LE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)+= pcm.o -OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o -OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.o +OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.o +OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_ZORK_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ZORK_ENCODER) += pcm.o
--- a/adpcm.c Thu Apr 17 21:57:52 2008 +0000 +++ b/adpcm.c Thu Apr 17 22:04:34 2008 +0000 @@ -1652,9 +1652,9 @@ ADPCM_CODEC (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav); ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws); ADPCM_CODEC (CODEC_ID_ADPCM_MS, adpcm_ms); -ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4); +ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2); ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3); -ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2); +ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4); ADPCM_CODEC (CODEC_ID_ADPCM_SWF, adpcm_swf); ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp); ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa);
--- a/allcodecs.c Thu Apr 17 21:57:52 2008 +0000 +++ b/allcodecs.c Thu Apr 17 22:04:34 2008 +0000 @@ -177,7 +177,6 @@ REGISTER_ENCDEC (ZMBV, zmbv); /* audio codecs */ - REGISTER_DECODER (MPEG4AAC, mpeg4aac); REGISTER_ENCDEC (AC3, ac3); REGISTER_DECODER (ALAC, alac); REGISTER_DECODER (APE, ape); @@ -195,6 +194,7 @@ REGISTER_DECODER (MP3ON4, mp3on4); REGISTER_DECODER (MPC7, mpc7); REGISTER_DECODER (MPC8, mpc8); + REGISTER_DECODER (MPEG4AAC, mpeg4aac); REGISTER_DECODER (NELLYMOSER, nellymoser); REGISTER_DECODER (QDM2, qdm2); REGISTER_DECODER (RA_144, ra_144);
--- a/pcm.c Thu Apr 17 21:57:52 2008 +0000 +++ b/pcm.c Thu Apr 17 22:04:34 2008 +0000 @@ -534,22 +534,22 @@ #define PCM_CODEC(id, name) \ PCM_ENCODER(id,name) PCM_DECODER(id,name) -PCM_CODEC (CODEC_ID_PCM_S32LE, pcm_s32le); -PCM_CODEC (CODEC_ID_PCM_S32BE, pcm_s32be); -PCM_CODEC (CODEC_ID_PCM_U32LE, pcm_u32le); -PCM_CODEC (CODEC_ID_PCM_U32BE, pcm_u32be); -PCM_CODEC (CODEC_ID_PCM_S24LE, pcm_s24le); -PCM_CODEC (CODEC_ID_PCM_S24BE, pcm_s24be); -PCM_CODEC (CODEC_ID_PCM_U24LE, pcm_u24le); -PCM_CODEC (CODEC_ID_PCM_U24BE, pcm_u24be); -PCM_CODEC (CODEC_ID_PCM_S24DAUD, pcm_s24daud); +PCM_CODEC (CODEC_ID_PCM_ALAW, pcm_alaw); +PCM_CODEC (CODEC_ID_PCM_MULAW, pcm_mulaw); +PCM_CODEC (CODEC_ID_PCM_S8, pcm_s8); +PCM_CODEC (CODEC_ID_PCM_S16BE, pcm_s16be); PCM_CODEC (CODEC_ID_PCM_S16LE, pcm_s16le); PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, pcm_s16le_planar); -PCM_CODEC (CODEC_ID_PCM_S16BE, pcm_s16be); -PCM_CODEC (CODEC_ID_PCM_U16LE, pcm_u16le); +PCM_CODEC (CODEC_ID_PCM_S24BE, pcm_s24be); +PCM_CODEC (CODEC_ID_PCM_S24DAUD, pcm_s24daud); +PCM_CODEC (CODEC_ID_PCM_S24LE, pcm_s24le); +PCM_CODEC (CODEC_ID_PCM_S32BE, pcm_s32be); +PCM_CODEC (CODEC_ID_PCM_S32LE, pcm_s32le); +PCM_CODEC (CODEC_ID_PCM_U8, pcm_u8); PCM_CODEC (CODEC_ID_PCM_U16BE, pcm_u16be); -PCM_CODEC (CODEC_ID_PCM_S8, pcm_s8); -PCM_CODEC (CODEC_ID_PCM_U8, pcm_u8); -PCM_CODEC (CODEC_ID_PCM_ALAW, pcm_alaw); -PCM_CODEC (CODEC_ID_PCM_MULAW, pcm_mulaw); +PCM_CODEC (CODEC_ID_PCM_U16LE, pcm_u16le); +PCM_CODEC (CODEC_ID_PCM_U24BE, pcm_u24be); +PCM_CODEC (CODEC_ID_PCM_U24LE, pcm_u24le); +PCM_CODEC (CODEC_ID_PCM_U32BE, pcm_u32be); +PCM_CODEC (CODEC_ID_PCM_U32LE, pcm_u32le); PCM_CODEC (CODEC_ID_PCM_ZORK, pcm_zork);