Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / oss_audio.c

diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 2fde491a07d06e84f30e9299d201baa96cf8892c..73cb575bb9da89227fe28ce6d93b2ac87aaca571 100644 (file)
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -80,13 +80,6 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
         fcntl(audio_fd, F_SETFL, O_NONBLOCK);
 
     s->frame_size = AUDIO_BLOCK_SIZE;
-#if 0
-    tmp = (NB_FRAGMENTS << 16) | FRAGMENT_BITS;
-    err = ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &tmp);
-    if (err < 0) {
-        perror("SNDCTL_DSP_SETFRAGMENT");
-    }
-#endif
 
     /* select format : favour native format */
     err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
@@ -216,13 +209,6 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     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);