diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-17 01:17:22 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-17 01:17:22 +0100 |
commit | fe0a71e0210d7c47cebcae1cd206ea8a2413063d (patch) | |
tree | 40341ae91d12563f67fc4ba8a47cc3335594115f /src/input/input_v4l.c | |
parent | 6bf1534d4b8bba9b9702baea5ee898151cf34c04 (diff) | |
parent | 65e56d6b071c42dfedd4a0b0c28e627465c67295 (diff) | |
download | xine-lib-fe0a71e0210d7c47cebcae1cd206ea8a2413063d.tar.gz xine-lib-fe0a71e0210d7c47cebcae1cd206ea8a2413063d.tar.bz2 |
Merge from 1.2 main branch.
Diffstat (limited to 'src/input/input_v4l.c')
-rw-r--r-- | src/input/input_v4l.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 17c4223a2..6829470ff 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -517,11 +517,9 @@ static int extract_mrl(v4l_input_plugin_t *this, char *mrl) /* Get frequency, if available */ sscanf(locator, "/%d", &frequency); - lprintf("Tuner name: '%s' freq: %d\n", tuner_name, frequency); - } else { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "input_v4l: No tuner name given. Expected syntax: v4l:/tuner/frequency\n" - "input_v4l: Using currently tuned settings\n"); + + /* cannot use xprintf to log in this routine */ + lprintf("input_v4l: Tuner name: %s frequency %d\n", tuner_name, frequency ); } this->frequency = frequency; |