[FFmpeg-devel] [PATCH 1/4] audioconvert: include the description of channels in the library.

[Stefano Sabatini]

On date Monday 2012-07-30 10:41:06 +0200, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavutil/audioconvert.c |   63 +++++++++++++++++++++++++---------------------
>  1 file changed, 34 insertions(+), 29 deletions(-)
> 
> 
> Renamed short_name / long_name into name / description.

> 
> 
> diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
> index e17f52e..8e65d59 100644
> --- a/libavutil/audioconvert.c
> +++ b/libavutil/audioconvert.c
> @@ -28,38 +28,43 @@
>  #include "audioconvert.h"
>  #include "bprint.h"
>  
> -static const char * const channel_names[] = {
> -    [0]  = "FL",        /* front left */
> -    [1]  = "FR",        /* front right */
> -    [2]  = "FC",        /* front center */
> -    [3]  = "LFE",       /* low frequency */
> -    [4]  = "BL",        /* back left */
> -    [5]  = "BR",        /* back right */
> -    [6]  = "FLC",       /* front left-of-center  */
> -    [7]  = "FRC",       /* front right-of-center */
> -    [8]  = "BC",        /* back-center */
> -    [9]  = "SL",        /* side left */
> -    [10] = "SR",        /* side right */
> -    [11] = "TC",        /* top center */
> -    [12] = "TFL",       /* top front left */
> -    [13] = "TFC",       /* top front center */
> -    [14] = "TFR",       /* top front right */
> -    [15] = "TBL",       /* top back left */
> -    [16] = "TBC",       /* top back center */
> -    [17] = "TBR",       /* top back right */
> -    [29] = "DL",        /* downmix left */
> -    [30] = "DR",        /* downmix right */
> -    [31] = "WL",        /* wide left */
> -    [32] = "WR",        /* wide right */
> -    [33] = "SDL",       /* surround direct left */
> -    [34] = "SDR",       /* surround direct right */
> +struct channel_name {
> +    const char *name;
> +    const char *description;
> +};

Still looks OK to me (even better), thanks.

[...]
-- 
FFmpeg = Fundamental and Fascinating Mastering Porno Erotic Genius