diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-19 01:09:39 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-19 01:09:39 +0100 |
| commit | fedec814a0af828f9c4e97ed49cdb727e0d64ad0 (patch) | |
| tree | 6614288d9f0937b640d0efcb757a6ea13bac7a6d /src/demuxers/demux_matroska.c | |
| parent | 5c2f96797e1ad0c9e1e930fd86941fcec27abdc4 (diff) | |
| parent | 64596f317f7d03ed1f3e747cd2b0664b1d4f6535 (diff) | |
| download | xine-lib-fedec814a0af828f9c4e97ed49cdb727e0d64ad0.tar.gz xine-lib-fedec814a0af828f9c4e97ed49cdb727e0d64ad0.tar.bz2 | |
Merge from 1.2 branch.
Diffstat (limited to 'src/demuxers/demux_matroska.c')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index f8166173a..16cf87978 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1749,10 +1749,7 @@ static int parse_tags(demux_matroska_t *this) { static void alloc_block_data (demux_matroska_t *this, int len) { /* memory management */ if (this->block_data_size < len) { - if (this->block_data) - this->block_data = realloc(this->block_data, len); - else - this->block_data = malloc(len); + this->block_data = realloc(this->block_data, len); this->block_data_size = len; } } |