From fd15adf6069b03be949c7c8d7e0f743b9ee6b90b Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 16 May 2007 17:37:06 +0100 Subject: v4l: replace faulty use of xprintf with lprintf. The current input_v4l in xine-lib 1.1.6 is inherently buggy (it will deference an invalid pointer in extract_mrl if the MRL contains a V4L input name or frequency). --- src/input/input_v4l.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') 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; -- cgit v1.2.3