summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-26 00:07:05 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-26 00:07:05 +0000
commitf3182f0b0184dae30d53c5dc7957669f81e20a85 (patch)
tree2f7531edf5f91384dce04b590fe1932f12303c53
parent557c24e609c7878e841d4374c93acdd24f379837 (diff)
downloadxine-lib-f3182f0b0184dae30d53c5dc7957669f81e20a85.tar.gz
xine-lib-f3182f0b0184dae30d53c5dc7957669f81e20a85.tar.bz2
Don't check ebml value, after all dispose_ebml_parser() is just an alias to free(), and it accepts NULL just fine.
CVS patchset: 8280 CVS date: 2006/09/26 00:07:05
-rw-r--r--src/demuxers/demux_matroska.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index debd9dfb5..21fe2a005 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.47 2006/07/10 22:08:13 dgp85 Exp $
+ * $Id: demux_matroska.c,v 1.48 2006/09/26 00:07:05 dgp85 Exp $
*
* demultiplexer for matroska streams
*
@@ -2669,8 +2669,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
return &this->demux_plugin;
error:
- if (ebml)
- dispose_ebml_parser(ebml);
+ dispose_ebml_parser(ebml);
free(this);
return NULL;
}