Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / alsa-audio-dec.c

diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
index f8977a10f90616f3d0dad487d8afd944f224ed3d..11c6e92928619348ad360a8ade61c9c013a47009 100644 (file)
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@@ -47,6 +47,7 @@
 
 #include <alsa/asoundlib.h>
 #include "libavutil/opt.h"
+#include "libavutil/mathematics.h"
 
 #include "avdevice.h"
 #include "alsa-audio.h"
@@ -58,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");
@@ -105,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;