diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-06 19:41:43 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-06 19:41:43 +0100 |
| commit | 40a1c7da2f5cfb6ed7210cbea192acd1b0231c41 (patch) | |
| tree | 7ee720d1b7e6692ad26e277e5fa08f928642a533 /src | |
| parent | 039b044abf0830eebf90e54d575a179a4ac0f0e1 (diff) | |
| parent | b1c711f131520ce268b6403bb7e61595300c5b81 (diff) | |
| download | xine-lib-40a1c7da2f5cfb6ed7210cbea192acd1b0231c41.tar.gz xine-lib-40a1c7da2f5cfb6ed7210cbea192acd1b0231c41.tar.bz2 | |
Merge from 1.1; adapt xine-list for 1.2.
--HG--
rename : debian/libxine1.install => debian/libxine2.install
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/xine_ogg_demuxer.c | 3 | ||||
| -rw-r--r-- | src/demuxers/ebml.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 25fed94d9..52788612f 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2110,6 +2110,9 @@ static void *ogg_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "OGG"; this->demux_class.mimetypes = "application/ogg: ogx: Ogg Stream;" + "application/x-ogm: ogx: Ogg Stream;" + "application/x-ogm-audio: oga: Ogg Audio;" + "application/x-ogm-video: ogv: Ogg Video;" "application/x-ogg: ogx: Ogg Stream;" "audio/ogg: oga: Ogg Audio;" "audio/x-ogg: oga: Ogg Audio;" diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 97bf0a615..1e9a456d2 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -321,7 +321,7 @@ char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml_elem_t *elem) if (text) { text[elem->len] = '\0'; - if (ebml_read_ascii (ebml, &elem, text)) + if (ebml_read_ascii (ebml, elem, text)) return text; free (text); } |