Search
j0ke.net Open Build Service
>
Projects
>
multimedia
>
libxine1
> xine-lib-fix-demuxers.diff
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File xine-lib-fix-demuxers.diff of Package libxine1 (Revision 36)
Currently displaying revision
36
,
show latest
diff -urN xine-lib-1.1.11.1.orig/src/demuxers/demux_matroska.c xine-lib-1.1.11.1/src/demuxers/demux_matroska.c --- xine-lib-1.1.11.1.orig/src/demuxers/demux_matroska.c 2008-03-28 15:24:50.000000000 +0100 +++ xine-lib-1.1.11.1/src/demuxers/demux_matroska.c 2008-04-08 19:28:32.000000000 +0200 @@ -635,9 +635,7 @@ } buf->size = frame[i]; - buf->decoder_flags = BUF_FLAG_HEADER; - if (i == 2) - buf->decoder_flags |= BUF_FLAG_FRAME_END; + buf->decoder_flags = BUF_FLAG_HEADER | BUF_FLAG_FRAME_START | BUF_FLAG_FRAME_END; buf->type = track->buf_type; buf->pts = 0; @@ -2915,7 +2913,8 @@ static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/mkv: mkv: matroska;"; + return "video/mkv: mkv: matroska;" + "video/x-matroska: mkv: matroska;"; } diff -urN xine-lib-1.1.11.1.orig/src/demuxers/demux_ogg.c xine-lib-1.1.11.1/src/demuxers/demux_ogg.c --- xine-lib-1.1.11.1.orig/src/demuxers/demux_ogg.c 2008-03-28 15:24:50.000000000 +0100 +++ xine-lib-1.1.11.1/src/demuxers/demux_ogg.c 2008-04-07 19:36:55.000000000 +0200 @@ -2166,6 +2166,9 @@ 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;" diff -urN xine-lib-1.1.11.1.orig/src/demuxers/demux_qt.c xine-lib-1.1.11.1/src/demuxers/demux_qt.c --- xine-lib-1.1.11.1.orig/src/demuxers/demux_qt.c 2008-03-28 23:50:47.000000000 +0100 +++ xine-lib-1.1.11.1/src/demuxers/demux_qt.c 2008-04-01 20:08:55.000000000 +0200 @@ -896,11 +896,6 @@ current_atom_size = _X_BE_32(&trak_atom[i - 4]); current_atom = _X_BE_32(&trak_atom[i]); - if (current_atom_size > trak_atom_size - i) { - last_error = QT_NOT_A_VALID_FILE; - goto free_trak; - } - if (current_atom == TKHD_ATOM) { trak->flags = _X_BE_16(&trak_atom[i + 6]); } else if (current_atom == ELST_ATOM) { diff -urN xine-lib-1.1.11.1.orig/src/demuxers/ebml.c xine-lib-1.1.11.1/src/demuxers/ebml.c --- xine-lib-1.1.11.1.orig/src/demuxers/ebml.c 2008-03-28 15:24:50.000000000 +0100 +++ xine-lib-1.1.11.1/src/demuxers/ebml.c 2008-04-06 00:38:26.000000000 +0200 @@ -327,7 +327,7 @@ if (text) { text[elem->len] = '\0'; - if (ebml_read_ascii (ebml, &elem, text)) + if (ebml_read_ascii (ebml, elem, text)) return text; free (text); }
