From 12dd57fd290346d301eccce6cf1984cc4ac50b6c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 2 Mar 2009 06:01:32 +0000 Subject: [PATCH] cosmetics: Reformat long_names so that "DPCM" comes first. Originally committed as revision 17721 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/general.texi | 16 ++++++++-------- libavcodec/dpcm.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index 5f708b71f..0a30a9697 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -522,6 +522,14 @@ following image formats are supported: @item COOK @tab @tab X @tab All versions except 5.1 are supported. @item DCA (DTS Coherent Acoustics) @tab @tab X +@item DPCM id RoQ @tab X @tab X + @tab Used in Quake III, Jedi Knight 2, other computer games. +@item DPCM Interplay @tab @tab X + @tab Used in various Interplay computer games. +@item DPCM Sierra Online @tab @tab X + @tab Used in Sierra Online game audio files. +@item DPCM Sol @tab @tab X +@item DPCM Xan @tab @tab X @item DSP Group TrueSpeech @tab @tab X @item DV audio @tab @tab X @item Enhanced AC-3 @tab @tab X @@ -531,11 +539,7 @@ following image formats are supported: @tab supported through external library libgsm @item GSM Microsoft variant @tab E @tab E @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 IMC (Intel Music Coder) @tab @tab X -@item Interplay DPCM @tab @tab X - @tab Used in various Interplay computer games. @item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X @item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X @item MLP(Meridian Lossless Packing)/TrueHD @tab @tab X @@ -582,12 +586,9 @@ following image formats are supported: @item RealAudio 3.0 (dnet) @tab IX @tab X @tab Real low bitrate AC-3 codec @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 Sol DPCM @tab @tab X @item Sonic @tab X @tab X @tab experimental codec @item Sonic lossless @tab X @tab X @@ -601,7 +602,6 @@ following image formats are supported: @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. @end multitable diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 227bf78bd..daa21cd09 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -309,7 +309,7 @@ AVCodec name ## _decoder = { \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; -DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "Interplay DPCM"); -DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "id RoQ DPCM"); -DPCM_DECODER(CODEC_ID_SOL_DPCM, sol_dpcm, "Sol DPCM"); -DPCM_DECODER(CODEC_ID_XAN_DPCM, xan_dpcm, "Xan DPCM"); +DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); +DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ"); +DPCM_DECODER(CODEC_ID_SOL_DPCM, sol_dpcm, "DPCM Sol"); +DPCM_DECODER(CODEC_ID_XAN_DPCM, xan_dpcm, "DPCM Xan"); -- 2.11.0