X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavdevice%2Falsa-audio-dec.c;h=11c6e92928619348ad360a8ade61c9c013a47009;hb=60b54e4b9fac8519bb68501b73ac0efbcce5cff0;hp=94162d2d9f0fa498eb7ab1e6c5b02281446888d6;hpb=f93f6963babf08a7bcf85b9a57f37266dc0a4ae0;p=ffmpeg diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 94162d2d9f0..11c6e929286 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -59,17 +59,8 @@ static av_cold int audio_read_header(AVFormatContext *s1, AVStream *st; int ret; enum CodecID codec_id; - snd_pcm_sw_params_t *sw_params; double o; -#if FF_API_FORMAT_PARAMETERS - if (ap->sample_rate > 0) - s->sample_rate = ap->sample_rate; - - if (ap->channels > 0) - s->channels = ap->channels; -#endif - st = av_new_stream(s1, 0); if (!st) { av_log(s1, AV_LOG_ERROR, "Cannot add stream\n"); @@ -106,7 +97,6 @@ fail: static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt) { AlsaData *s = s1->priv_data; - AVStream *st = s1->streams[0]; int res; int64_t dts; snd_pcm_sframes_t delay = 0;