diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
| commit | 240550bbb94653907faa6e0bb1c5ac3d279cc252 (patch) | |
| tree | 1cd5346e52515dbeff187d040d79b92fae96caa9 /libao2 | |
| parent | 9895f2360fd5e8c48f21117d6934254317891cde (diff) | |
| parent | fbb74e16a38d6a5af31a7fb369195988f7414766 (diff) | |
| download | mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.bz2 mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.xz | |
Merge svn changes up to r30848
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_mpegpes.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index e359d06536..b2521529b5 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -30,11 +30,6 @@ #include "config.h" -#ifdef CONFIG_DVB -#include <poll.h> -#include <sys/ioctl.h> -#endif - #include "audio_out.h" #include "audio_out_internal.h" @@ -46,14 +41,11 @@ #include "help_mp.h" #ifdef CONFIG_DVB -#ifndef CONFIG_DVB_HEAD -#include <ost/audio.h> -audioMixer_t dvb_mixer={255,255}; -#else +#include <poll.h> +#include <sys/ioctl.h> #include <linux/dvb/audio.h> audio_mixer_t dvb_mixer={255,255}; #endif -#endif #define true 1 #define false 0 @@ -116,13 +108,8 @@ static int freq_id=0; static int init_device(int card) { char ao_file[30]; -#ifndef CONFIG_DVB_HEAD - mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n"); - sprintf(ao_file, "/dev/ost/audio"); -#else mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/dvb/adapter%d/audio0\n", card); sprintf(ao_file, "/dev/dvb/adapter%d/audio0", card); -#endif if((vo_mpegpes_fd2 = open(ao_file,O_RDWR|O_NONBLOCK)) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO DEVICE: %s\n", strerror(errno)); |