From 1263a3ae411fe768568092ed755d08794d8f6b93 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 5 Apr 2008 00:53:25 +0100 Subject: Fix a regression in the Matroska demuxer. One '&'... --- src/demuxers/ebml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 0c633643f..4ce8a549d 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -327,7 +327,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); } -- cgit v1.2.3 From 1397c2baedd7a1f4a203c4a1ce14d8a46ba5d523 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 6 Apr 2008 19:28:32 +0100 Subject: Add some newer Ogg MIME types. --- src/demuxers/demux_ogg.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 175d61cd8..33c262793 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -2166,6 +2166,9 @@ static const char *ogg_get_extensions (demux_class_t *this_gen) { static const char *ogg_get_mimetypes (demux_class_t *this_gen) { return "application/ogg: ogx: Ogg Stream;" "application/x-ogg: ogx: Ogg Stream;" + "application/x-ogm: ogx: Ogg Stream;" + "application/x-ogm-audio: oga: Ogg Audio;" + "application/x-ogm-video: ogv: Ogg Video;" "audio/ogg: oga: Ogg Audio;" "audio/x-ogg: oga: Ogg Audio;" "video/ogg: ogv: Ogg Video;" -- cgit v1.2.3