Only print "invalid new backstep" when it is really invalid.

[ffmpeg] / libavdevice / audio.c

diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index 172c5f1a3831bc1abd657ab18c3522cb97ebb91f..1cb3d69409018be7cf72cc108893aa726a8facdb 100644 (file)
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -129,8 +129,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
         av_log(NULL, AV_LOG_ERROR, "SNDCTL_DSP_STEREO: %s\n", strerror(errno));
         goto fail;
     }
-    if (tmp)
-        s->channels = 2;
 
     tmp = s->sample_rate;
     err = ioctl(audio_fd, SNDCTL_DSP_SPEED, &tmp);
@@ -315,7 +313,7 @@ static int audio_read_close(AVFormatContext *s1)
 #ifdef CONFIG_OSS_DEMUXER
 AVInputFormat oss_demuxer = {
     "oss",
-    NULL_IF_CONFIG_SMALL("audio grab and output"),
+    NULL_IF_CONFIG_SMALL("Open Sound System capture"),
     sizeof(AudioData),
     NULL,
     audio_read_header,
@@ -328,7 +326,7 @@ AVInputFormat oss_demuxer = {
 #ifdef CONFIG_OSS_MUXER
 AVOutputFormat oss_muxer = {
     "oss",
-    NULL_IF_CONFIG_SMALL("audio grab and output"),
+    NULL_IF_CONFIG_SMALL("Open Sound System playback"),
     "",
     "",
     sizeof(AudioData),