cosmetics: Reformat long_names so that "ADPCM" comes first.

Originally committed as revision 17720 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 69 insertions, 69 deletions

diff --git a/doc/general.texi b/doc/general.texi
index 8972c9c8af..5f708b71f5 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -463,11 +463,53 @@ following image formats are supported:
 
 @multitable @columnfractions .4 .1 .1 .4
 @item Name @tab Encoding @tab Decoding @tab Comments
-@item 4X Movie ADPCM         @tab     @tab  X
 @item 8SVX audio             @tab     @tab  X
 @item AAC                    @tab  E  @tab  X
     @tab encoding supported through external library libfaac
 @item AC-3                   @tab  X  @tab  X
+@item ADPCM 4X Movie         @tab     @tab  X
+@item ADPCM CDROM XA         @tab     @tab  X
+@item ADPCM Creative Technology @tab     @tab  X
+    @tab 16 -> 4, 8 -> 4, 8 -> 3, 8 -> 2
+@item ADPCM Electronic Arts  @tab     @tab  X
+    @tab Used in various EA titles.
+@item ADPCM Electronic Arts Maxis CDROM XS  @tab     @tab  X
+    @tab Used in Sim City 3000.
+@item ADPCM Electronic Arts R1  @tab     @tab  X
+@item ADPCM Electronic Arts R2  @tab     @tab  X
+@item ADPCM Electronic Arts R3  @tab     @tab  X
+@item ADPCM Electronic Arts XAS @tab     @tab  X
+@item ADPCM G.726            @tab  X  @tab  X
+@item ADPCM IMA AMV          @tab     @tab  X
+    @tab Used in AMV files
+@item ADPCM IMA Electronic Arts EACS  @tab     @tab  X
+@item ADPCM IMA Electronic Arts SEAD  @tab     @tab  X
+@item ADPCM IMA Funcom       @tab     @tab  X
+@item ADPCM IMA QuickTime    @tab  X  @tab  X
+@item ADPCM IMA Loki SDL MJPEG  @tab     @tab  X
+@item ADPCM IMA WAV          @tab  X  @tab  X
+@item ADPCM IMA Westwood     @tab     @tab  X
+@item ADPCM ISS IMA          @tab     @tab  X
+    @tab Used in FunCom games.
+@item ADPCM IMA Duck DK3     @tab     @tab  X
+    @tab Used in some Sega Saturn console games.
+@item ADPCM IMA Duck DK4     @tab     @tab  X
+    @tab Used in some Sega Saturn console games.
+@item ADPCM Microsoft        @tab  X  @tab  X
+@item ADPCM MS IMA           @tab  X  @tab  X
+@item ADPCM Nintendo Gamecube THP  @tab     @tab  X
+@item ADPCM QT IMA           @tab  X  @tab  X
+@item ADPCM SEGA CRI ADX     @tab  X  @tab  X
+    @tab Used in Sega Dreamcast games.
+@item ADPCM Shockwave Flash  @tab  X  @tab  X
+@item ADPCM SMJPEG IMA       @tab     @tab  X
+    @tab Used in certain Loki game ports.
+@item ADPCM Sound Blaster Pro 2-bit  @tab     @tab  X
+@item ADPCM Sound Blaster Pro 2.6-bit  @tab     @tab  X
+@item ADPCM Sound Blaster Pro 4-bit  @tab     @tab  X
+@item ADPCM Westwood Studios IMA @tab     @tab  X
+    @tab Used in Westwood Studios games like Command and Conquer.
+@item ADPCM Yamaha           @tab  X  @tab  X
 @item AMR-NB                 @tab  E  @tab  E
     @tab supported through external library libamrnb
 @item AMR-WB                 @tab  E  @tab  E
@@ -475,27 +517,15 @@ following image formats are supported:
 @item Apple lossless audio   @tab  X  @tab  X
     @tab QuickTime fourcc 'alac'
 @item Atrac 3                @tab     @tab  X
-@item CDROM XA ADPCM         @tab     @tab  X
 @item Delphine Software International CIN audio  @tab     @tab  X
     @tab Codec used in Delphine Software International games.
 @item COOK                   @tab     @tab  X
     @tab All versions except 5.1 are supported.
-@item Creative Technology ADPCM @tab     @tab  X
-    @tab 16 -> 4, 8 -> 4, 8 -> 3, 8 -> 2
 @item DCA (DTS Coherent Acoustics)  @tab     @tab  X
 @item DSP Group TrueSpeech   @tab     @tab  X
 @item DV audio               @tab     @tab  X
-@item Electronic Arts ADPCM  @tab     @tab  X
-    @tab Used in various EA titles.
-@item Electronic Arts Maxis CDROM XS ADPCM  @tab     @tab  X
-    @tab Used in Sim City 3000.
-@item Electronic Arts R1 ADPCM  @tab     @tab  X
-@item Electronic Arts R2 ADPCM  @tab     @tab  X
-@item Electronic Arts R3 ADPCM  @tab     @tab  X
-@item Electronic Arts XAS ADPCM @tab     @tab  X
 @item Enhanced AC-3          @tab     @tab  X
 @item FLAC (Free Lossless Audio Codec)  @tab  X  @tab  IX
-@item G.726 ADPCM            @tab  X  @tab  X
 @item G.729                  @tab     @tab  X
 @item GSM                    @tab  E  @tab  E
     @tab supported through external library libgsm
@@ -503,27 +533,11 @@ following image formats are supported:
     @tab supported through external library libgsm
 @item id RoQ DPCM            @tab  X  @tab  X
     @tab Used in Quake III, Jedi Knight 2, other computer games.
-@item IMA AMV ADPCM          @tab     @tab  X
-    @tab Used in AMV files
-@item IMA Electronic Arts EACS ADPCM  @tab     @tab  X
-@item IMA Electronic Arts SEAD ADPCM  @tab     @tab  X
-@item IMA Funcom ADPCM       @tab     @tab  X
-@item IMA QuickTime ADPCM    @tab  X  @tab  X
-@item IMA Loki SDL MJPEG ADPCM  @tab     @tab  X
-@item IMA WAV ADPCM          @tab  X  @tab  X
-@item IMA Westwood ADPCM     @tab     @tab  X
 @item IMC (Intel Music Coder)  @tab     @tab  X
 @item Interplay DPCM         @tab     @tab  X
     @tab Used in various Interplay computer games.
-@item ISS IMA ADPCM          @tab     @tab  X
-    @tab Used in FunCom games.
-@item IMA Duck DK3 ADPCM     @tab     @tab  X
-    @tab Used in some Sega Saturn console games.
-@item IMA Duck DK4 ADPCM     @tab     @tab  X
-    @tab Used in some Sega Saturn console games.
 @item MACE (Macintosh Audio Compression/Expansion) 3:1  @tab     @tab  X
 @item MACE (Macintosh Audio Compression/Expansion) 6:1  @tab     @tab  X
-@item Microsoft ADPCM        @tab  X  @tab  X
 @item MLP(Meridian Lossless Packing)/TrueHD  @tab     @tab  X
     @tab Used in DVD-Audio and Blu-Ray discs.
 @item Monkey's Audio         @tab     @tab  X
@@ -532,11 +546,9 @@ following image formats are supported:
 @item MP2 (MPEG audio layer 2)  @tab IX  @tab IX
 @item MP3 (MPEG audio layer 3)  @tab  E  @tab IX
     @tab encoding supported through external library LAME, ADU MP3 and MP3onMP4 also supported
-@item MS IMA ADPCM           @tab  X  @tab  X
 @item Musepack SV7           @tab     @tab  X
 @item Musepack SV8           @tab     @tab  X
 @item Nellymoser Asao        @tab  X  @tab  X
-@item Nintendo Gamecube THP ADPCM  @tab     @tab  X
 @item PCM A-law              @tab  X  @tab  X
 @item PCM mu-law             @tab  X  @tab  X
 @item PCM 16-bit little-endian planar  @tab     @tab  X
@@ -563,46 +575,34 @@ following image formats are supported:
 @item QCELP / PureVoice      @tab     @tab  X
 @item QDesign Music Codec 2  @tab     @tab  X
     @tab There are still some distortions.
-@item QT IMA ADPCM           @tab  X  @tab  X
 @item RealAudio 1.0 (14.4K)  @tab     @tab  X
     @tab Real 14400 bit/s codec
 @item RealAudio 2.0 (28.8K)  @tab     @tab  X
     @tab Real 28800 bit/s codec
 @item RealAudio 3.0 (dnet)   @tab IX  @tab  X
     @tab Real low bitrate AC-3 codec
-@item SEGA CRI ADX ADPCM     @tab  X  @tab  X
-    @tab Used in Sega Dreamcast games.
-@item Shockwave Flash ADPCM  @tab  X  @tab  X
 @item Shorten                @tab     @tab  X
 @item Sierra Online DPCM     @tab     @tab  X
     @tab Used in Sierra Online game audio files.
 @item Sierra VMD audio       @tab     @tab  X
     @tab Used in Sierra VMD files.
 @item Smacker audio          @tab     @tab  X
-@item SMJPEG IMA ADPCM       @tab     @tab  X
-    @tab Used in certain Loki game ports.
 @item Sol DPCM               @tab     @tab  X
 @item Sonic                  @tab  X  @tab  X
     @tab experimental codec
 @item Sonic lossless         @tab  X  @tab  X
     @tab experimental codec
-@item Sound Blaster Pro 2-bit ADPCM  @tab     @tab  X
-@item Sound Blaster Pro 2.6-bit ADPCM  @tab     @tab  X
-@item Sound Blaster Pro 4-bit ADPCM  @tab     @tab  X
 @item Speex                  @tab     @tab  E
     @tab supported through external library libspeex
 @item True Audio (TTA)       @tab     @tab  X
 @item Vorbis                 @tab  E  @tab  X
     @ A native but very primitive encoder exists.
 @item WavPack                @tab     @tab  X
-@item Westwood Studios IMA ADPCM @tab     @tab  X
-    @tab Used in Westwood Studios games like Command and Conquer.
 @item Westwood Audio (SND1)  @tab     @tab  X
 @item Windows Media Audio 1  @tab  X  @tab  X
 @item Windows Media Audio 2  @tab  X  @tab  X
 @item Xan DPCM               @tab     @tab  X
     @tab Used in Origin's Wing Commander IV AVI files.
-@item Yamaha ADPCM           @tab  X  @tab  X
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 5b3f11c2ec..994c0c6865 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1656,29 +1656,29 @@ AVCodec name ## _decoder = {                    \
     ADPCM_ENCODER(id,name,long_name_) ADPCM_DECODER(id,name,long_name_)
 
 /* Note: Do not forget to add new entries to the Makefile as well. */
-ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "4X Movie ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct, "Creative Technology ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea, "Electronic Arts ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa, "Electronic Arts Maxis CDROM XA ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1, "Electronic Arts R1 ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2, "Electronic Arts R2 ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3, "Electronic Arts R3 ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_EA_XAS, adpcm_ea_xas, "Electronic Arts XAS ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv, "IMA AMV ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3, "IMA Duck DK3 ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4, "IMA Duck DK4 ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs, "IMA Electronic Arts EACS ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead, "IMA Electronic Arts SEAD ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_ISS, adpcm_ima_iss, "IMA Funcom ISS ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, "IMA QuickTime ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg, "IMA Loki SDL MJPEG ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "IMA WAV ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "IMA Westwood ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_MS, adpcm_ms, "Microsoft ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "Sound Blaster Pro 2-bit ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "Sound Blaster Pro 2.6-bit ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "Sound Blaster Pro 4-bit ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_SWF, adpcm_swf, "Shockwave Flash ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "Nintendo Gamecube THP ADPCM");
-ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "CDROM XA ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "Yamaha ADPCM");
+ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie");
+ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct, "ADPCM Creative Technology");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea, "ADPCM Electronic Arts");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa, "ADPCM Electronic Arts Maxis CDROM XA");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1, "ADPCM Electronic Arts R1");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2, "ADPCM Electronic Arts R2");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3, "ADPCM Electronic Arts R3");
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_XAS, adpcm_ea_xas, "ADPCM Electronic Arts XAS");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv, "ADPCM IMA AMV");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3, "ADPCM IMA Duck DK3");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4, "ADPCM IMA Duck DK4");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs, "ADPCM IMA Electronic Arts EACS");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead, "ADPCM IMA Electronic Arts SEAD");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_ISS, adpcm_ima_iss, "ADPCM IMA Funcom ISS");
+ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, "ADPCM IMA QuickTime");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG");
+ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "ADPCM IMA WAV");
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "ADPCM IMA Westwood");
+ADPCM_CODEC  (CODEC_ID_ADPCM_MS, adpcm_ms, "ADPCM Microsoft");
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-bit");
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.6-bit");
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-bit");
+ADPCM_CODEC  (CODEC_ID_ADPCM_SWF, adpcm_swf, "ADPCM Shockwave Flash");
+ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "ADPCM Nintendo Gamecube THP");
+ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "ADPCM CDROM XA");
+ADPCM_CODEC  (CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "ADPCM Yamaha");