X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavdevice%2Falsa-audio-enc.c;h=fd013160d6225b10a6537522b65bcb44c570e3b3;hb=7f92f3d8129f44bc2ed935e9d81735ffdcd9921f;hp=0da22bb07093f457805c333eb7fe2e9e9735f448;hpb=22bf6f7054d46e942ab02d434d3af6c08875576b;p=ffmpeg diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index 0da22bb0709..fd013160d62 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -39,6 +39,7 @@ #include +#include "libavformat/internal.h" #include "avdevice.h" #include "alsa-audio.h" @@ -61,7 +62,7 @@ static av_cold int audio_write_header(AVFormatContext *s1) st->codec->sample_rate, sample_rate); goto fail; } - av_set_pts_info(st, 64, 1, sample_rate); + avpriv_set_pts_info(st, 64, 1, sample_rate); return res; @@ -114,16 +115,14 @@ audio_get_output_timestamp(AVFormatContext *s1, int stream, } AVOutputFormat ff_alsa_muxer = { - "alsa", - NULL_IF_CONFIG_SMALL("ALSA audio output"), - "", - "", - sizeof(AlsaData), - DEFAULT_CODEC_ID, - CODEC_ID_NONE, - audio_write_header, - audio_write_packet, - ff_alsa_close, + .name = "alsa", + .long_name = NULL_IF_CONFIG_SMALL("ALSA audio output"), + .priv_data_size = sizeof(AlsaData), + .audio_codec = DEFAULT_CODEC_ID, + .video_codec = CODEC_ID_NONE, + .write_header = audio_write_header, + .write_packet = audio_write_packet, + .write_trailer = ff_alsa_close, .get_output_timestamp = audio_get_output_timestamp, - .flags = AVFMT_NOFILE, + .flags = AVFMT_NOFILE, };