diff options
| author | Jacob Meuser <jakemsr@jakemsr.com> | 2005-05-09 13:24:23 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-09 13:24:23 +0000 |
| commit | 8c802695b9498d2cb80765c508c761f02061c8f5 (patch) | |
| tree | 35edadbec794adcc822d5f054faf4bcc544a53ac | |
| parent | 01cf54f041eaf72a0febc3ba97116d5bdacb1955 (diff) | |
| download | ffmpeg-8c802695b9498d2cb80765c508c761f02061c8f5.tar.gz | |
OpenBSD support patch by (Jacob Meuser // jakemsr jakemsr com)
Originally committed as revision 4208 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | libavformat/audio.c | 8 |
2 files changed, 18 insertions, 1 deletions
@@ -263,6 +263,15 @@ case `uname -r` in ;; esac ;; +OpenBSD) +v4l="no" +audio_oss="yes" +dv1394="no" +make="gmake" +CFLAGS="$CFLAGS \$(PIC)" +LDFLAGS="$LDFLAGS -export-dynamic -pthread" +extralibs="$extralibs -lossaudio" +;; FreeBSD) v4l="no" audio_oss="yes" @@ -1295,7 +1304,7 @@ if test "$pthreads" = "yes" ; then echo "HAVE_PTHREADS=yes" >> config.mak echo "#define HAVE_PTHREADS 1" >> $TMPH echo "#define HAVE_THREADS 1" >> $TMPH - if test $targetos != FreeBSD; then + if test $targetos != FreeBSD -a $targetos != OpenBSD ; then extralibs="$extralibs -lpthread" fi fi diff --git a/libavformat/audio.c b/libavformat/audio.c index b03169accf..ec7e4365ae 100644 --- a/libavformat/audio.c +++ b/libavformat/audio.c @@ -21,7 +21,11 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#ifdef __OpenBSD__ +#include <soundcard.h> +#else #include <sys/soundcard.h> +#endif #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> @@ -49,7 +53,11 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) /* 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); |