Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / sndio_dec.c

diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 3014fd2787dd44dc0798b8ad6be5aa834a3b3df6..6e386c6d991777da2d762f046de7171559d6286c 100644 (file)
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -34,13 +34,6 @@ static av_cold int audio_read_header(AVFormatContext *s1,
     AVStream *st;
     int ret;
 
-#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)
         return AVERROR(ENOMEM);