diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-17 22:53:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-17 22:53:35 +0000 |
| commit | 255f131648030618f753c27139d4b278f11020c7 (patch) | |
| tree | b28a41924089d059424f06bd06ff73cf10838b5e /src/input | |
| parent | 5e1efcee823576470ffa3ae2f57ba5c6020e436b (diff) | |
| parent | 4b30fc7d0ad482d4449703e9270df933cdd755ee (diff) | |
| download | xine-lib-255f131648030618f753c27139d4b278f11020c7.tar.gz xine-lib-255f131648030618f753c27139d4b278f11020c7.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/input_v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 28e5b16ce..a8f387b3d 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -114,8 +114,8 @@ static const char *const tv_standard_names[] = { "PAL", "NTSC", "SECAM", NULL }; static const int tv_standard_values[] = { VIDEO_MODE_PAL, VIDEO_MODE_NTSC, VIDEO_MODE_SECAM }; #define NUM_RESOLUTIONS (sizeof(resolutions)/sizeof(resolutions[0])) -#define RADIO_DEV "/dev/v4l/radio0" -#define VIDEO_DEV "/dev/v4l/video0" +#define RADIO_DEV "/dev/radio0" +#define VIDEO_DEV "/dev/video0" #if !defined(NDELAY) && defined(O_NDELAY) #define FNDELAY O_NDELAY |