diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
| commit | b70e34352e304cf03da32b688d84eec3c3ffacec (patch) | |
| tree | 711ec8d7abc0dd6075d09085634e5a5432e40ee3 /src/input | |
| parent | 08ad733e0103834bc61831ddce5a75c3f62e0173 (diff) | |
| parent | 2b0e330c2642081066316ca5ec9965912cd248de (diff) | |
| download | xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.gz xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/input_v4l.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 302b96b57..93725167f 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1629,7 +1629,8 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) { data. */ free(this->audio_content_base); free(this->video_content_base); - free(this->frames_base->extra_info); + if (this->frames_base) + free(this->frames_base->extra_info); free(this->frames_base); #ifdef LOG |