diff options
Diffstat (limited to 'contrib/ffmpeg/libavformat/audio.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/audio.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/contrib/ffmpeg/libavformat/audio.c b/contrib/ffmpeg/libavformat/audio.c index 1dfccccb8..a9e5bffd5 100644 --- a/contrib/ffmpeg/libavformat/audio.c +++ b/contrib/ffmpeg/libavformat/audio.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#ifdef __OpenBSD__ +#ifdef HAVE_SOUNDCARD_H #include <soundcard.h> #else #include <sys/soundcard.h> @@ -53,14 +53,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) int tmp, err; char *flip = getenv("AUDIO_FLIP_LEFT"); - /* open linux audio device */ - if (!audio_device) -#ifdef __OpenBSD__ - audio_device = "/dev/sound"; -#else - audio_device = "/dev/dsp"; -#endif - if (is_output) audio_fd = open(audio_device, O_WRONLY); else @@ -224,12 +216,12 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) st = av_new_stream(s1, 0); if (!st) { - return -ENOMEM; + return AVERROR(ENOMEM); } s->sample_rate = ap->sample_rate; s->channels = ap->channels; - ret = audio_open(s, 0, ap->device); + ret = audio_open(s, 0, s1->filename); if (ret < 0) { av_free(st); return AVERROR_IO; |