diff options
| -rw-r--r-- | src/demuxers/demux_matroska.c | 7 | ||||
| -rw-r--r-- | src/input/vcd/xineplug_inp_vcd.c | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 5760a6c61..6c2b19484 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_matroska.c,v 1.22 2004/02/12 23:31:19 jstembridge Exp $ + * $Id: demux_matroska.c,v 1.23 2004/03/05 17:50:30 mroi Exp $ * * demultiplexer for matroska streams * @@ -1762,6 +1762,7 @@ static void demux_matroska_dispose (demux_plugin_t *this_gen) { free (track); } + dispose_ebml_parser(this->ebml); free (this); } @@ -1839,7 +1840,7 @@ static int demux_matroska_get_optional_data (demux_plugin_t *this_gen, static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream, input_plugin_t *input) { - demux_matroska_t *this; + demux_matroska_t *this = NULL; ebml_parser_t *ebml = NULL; lprintf("trying to open %s...\n", input->get_mrl(input)); @@ -1852,7 +1853,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str input->seek(input, 0, SEEK_SET); ebml = new_ebml_parser(stream->xine, input); if (!ebml_check_header(ebml)) - return NULL; + goto error; } break; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 26646ef6a..25b1d7acb 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,5 @@ /* - $Id: xineplug_inp_vcd.c,v 1.11 2004/02/28 19:29:38 rockyb Exp $ + $Id: xineplug_inp_vcd.c,v 1.12 2004/03/05 17:50:29 mroi Exp $ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> @@ -908,7 +908,7 @@ static char * vcd_class_get_description (input_class_t *this_gen) { dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return _(strdup("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... ")); + return _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); } /*! @@ -921,7 +921,7 @@ vcd_class_get_description (input_class_t *this_gen) static char * vcd_class_get_identifier (input_class_t *this_gen) { dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return strdup(SHORT_PLUGIN_NAME); + return SHORT_PLUGIN_NAME; } /* @@ -1432,7 +1432,7 @@ vcd_class_get_instance (input_class_t *class_gen, xine_stream_t *stream, dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called with %s\n", mrl); if ( strncasecmp(check_mrl, MRL_PREFIX, MRL_PREFIX_LEN) ) { - return NULL; + goto free_and_return; } vcd_get_default_device(class, false); |