diff options
| author | František Dvořák <valtri@civ.zcu.cz> | 2008-11-20 21:01:27 +0100 |
|---|---|---|
| committer | František Dvořák <valtri@civ.zcu.cz> | 2008-11-20 21:01:27 +0100 |
| commit | d654aee31f58dd481ded257d89d0ee293b68661f (patch) | |
| tree | f314b454580c181d0c09fd0a039ad7ce8101fbb2 /src/demuxers | |
| parent | ea2b5508e35f5125fd65730822b30bb8895ad87d (diff) | |
| download | xine-lib-d654aee31f58dd481ded257d89d0ee293b68661f.tar.gz xine-lib-d654aee31f58dd481ded257d89d0ee293b68661f.tar.bz2 | |
Memory access fixes:
- goom initialization
- matroska playing recent files with AAC
- replace free() by ffmpeg's av_free() in ff decoders
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index e6dd564a6..ec75cb97a 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2007 the xine project + * Copyright (C) 2000-2008 the xine project * * This file is part of xine, a free video player. * @@ -676,7 +676,11 @@ static void init_codec_aac(demux_matroska_t *this, matroska_track_t *track) { /* Create a DecoderSpecificInfo for initialising libfaad */ sr_index = aac_get_sr_index(atrack->sampling_freq); - if (!strncmp (&track->codec_id[12], "MAIN", 4)) + /* newer specification with appended CodecPrivate */ + if (strlen(track->codec_id) <= 12) + profile = 3; + /* older specification */ + else if (!strncmp (&track->codec_id[12], "MAIN", 4)) profile = 0; else if (!strncmp (&track->codec_id[12], "LC", 2)) profile = 1; |