[FFmpeg-cvslog] r12886 - in trunk/libavcodec: Makefile adpcm.c allcodecs.c pcm.c
diego
subversion
Fri Apr 18 00:04:34 CEST 2008
Author: diego
Date: Fri Apr 18 00:04:34 2008
New Revision: 12886
Log:
cosmetics: Sort some lists alphabetically.
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/adpcm.c
trunk/libavcodec/allcodecs.c
trunk/libavcodec/pcm.c
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Fri Apr 18 00:04:34 2008
@@ -233,41 +233,41 @@ OBJS-$(CONFIG_ZLIB_ENCODER) +
OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.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_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_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
Modified: trunk/libavcodec/adpcm.c
==============================================================================
--- trunk/libavcodec/adpcm.c (original)
+++ trunk/libavcodec/adpcm.c Fri Apr 18 00:04:34 2008
@@ -1652,9 +1652,9 @@ ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG,
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_3, adpcm_sbpro_3);
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_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);
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Fri Apr 18 00:04:34 2008
@@ -177,7 +177,6 @@ void avcodec_register_all(void)
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 @@ void avcodec_register_all(void)
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);
Modified: trunk/libavcodec/pcm.c
==============================================================================
--- trunk/libavcodec/pcm.c (original)
+++ trunk/libavcodec/pcm.c Fri Apr 18 00:04:34 2008
@@ -534,22 +534,22 @@ AVCodec name ## _decoder = {
#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_U16BE, pcm_u16be);
-PCM_CODEC (CODEC_ID_PCM_S8, pcm_s8);
+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_ALAW, pcm_alaw);
-PCM_CODEC (CODEC_ID_PCM_MULAW, pcm_mulaw);
+PCM_CODEC (CODEC_ID_PCM_U16BE, pcm_u16be);
+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);
More information about the ffmpeg-cvslog
mailing list