[FFmpeg-devel] [PATCH]Sanitize -formats output for audio devices

[Stefano Sabatini]

On date Wednesday 2012-11-21 13:23:35 +0100, Carl Eugen Hoyos encoded:
> Hi!
> 
> Alternative would be to add "capture / playback" to all of them.
> 
> Please comment, Carl Eugen

> diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
> index b781daf..105e92b 100644
> --- a/libavdevice/alsa-audio-dec.c
> +++ b/libavdevice/alsa-audio-dec.c
> @@ -146,7 +146,7 @@ static const AVClass alsa_demuxer_class = {
>  
>  AVInputFormat ff_alsa_demuxer = {
>      .name           = "alsa",
> -    .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio input"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio"),
>      .priv_data_size = sizeof(AlsaData),
>      .read_header    = audio_read_header,
>      .read_packet    = audio_read_packet,
> diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c
> index 403a44f..4e2fc0a 100644
> --- a/libavdevice/alsa-audio-enc.c
> +++ b/libavdevice/alsa-audio-enc.c
> @@ -116,7 +116,7 @@ audio_get_output_timestamp(AVFormatContext *s1, int stream,
>  
>  AVOutputFormat ff_alsa_muxer = {
>      .name           = "alsa",
> -    .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio output"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio"),
>      .priv_data_size = sizeof(AlsaData),
>      .audio_codec    = DEFAULT_CODEC_ID,
>      .video_codec    = AV_CODEC_ID_NONE,
> diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
> index aa40034..19a8904 100644
> --- a/libavdevice/oss_audio.c
> +++ b/libavdevice/oss_audio.c
> @@ -299,7 +299,7 @@ static const AVClass oss_demuxer_class = {
>  
>  AVInputFormat ff_oss_demuxer = {
>      .name           = "oss",
> -    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) capture"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System)"),
>      .priv_data_size = sizeof(AudioData),
>      .read_header    = audio_read_header,
>      .read_packet    = audio_read_packet,
> @@ -312,7 +312,7 @@ AVInputFormat ff_oss_demuxer = {
>  #if CONFIG_OSS_OUTDEV
>  AVOutputFormat ff_oss_muxer = {
>      .name           = "oss",
> -    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System)"),
>      .priv_data_size = sizeof(AudioData),
>      /* XXX: we make the assumption that the soundcard accepts this format */
>      /* XXX: find better solution with "preinit" method, needed also in
> diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
> index 2d7b848..d5b13e3 100644
> --- a/libavdevice/sndio_dec.c
> +++ b/libavdevice/sndio_dec.c
> @@ -107,7 +107,7 @@ static const AVClass sndio_demuxer_class = {
>  
>  AVInputFormat ff_sndio_demuxer = {
>      .name           = "sndio",
> -    .long_name      = NULL_IF_CONFIG_SMALL("sndio audio capture"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("sndio audio"),
>      .priv_data_size = sizeof(SndioData),
>      .read_header    = audio_read_header,
>      .read_packet    = audio_read_packet,
> diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
> index 84d070e..3f2e680 100644
> --- a/libavdevice/sndio_enc.c
> +++ b/libavdevice/sndio_enc.c
> @@ -78,7 +78,7 @@ static int audio_write_trailer(AVFormatContext *s1)
>  
>  AVOutputFormat ff_sndio_muxer = {
>      .name           = "sndio",
> -    .long_name      = NULL_IF_CONFIG_SMALL("sndio audio playback"),
> +    .long_name      = NULL_IF_CONFIG_SMALL("sndio audio"),
>      .priv_data_size = sizeof(SndioData),
>      /* XXX: we make the assumption that the soundcard accepts this format */
>      /* XXX: find better solution with "preinit" method, needed also in

Missing v4l/v4l2?

Patch LGTM.
-- 
FFmpeg = Fabulous Fascinating Mythic Ponderous Evil Gadget