summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2005-07-29 17:57:00 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2005-07-29 17:57:00 +0000
commitad36865ec4abb82450ce4192d8050b3a979d20ec (patch)
tree9473afde4efbac13ddce8fd5d63783883658aa6d
parent61980aef155809b70a34ec3532fb7c5bbadd8109 (diff)
downloadxine-lib-ad36865ec4abb82450ce4192d8050b3a979d20ec.tar.gz
xine-lib-ad36865ec4abb82450ce4192d8050b3a979d20ec.tar.bz2
Add support for mpeg1/2 video in matroska
CVS patchset: 7694 CVS date: 2005/07/29 17:57:00
-rw-r--r--src/demuxers/demux_matroska.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 62a5e5ea3..7dba6f199 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_matroska.c,v 1.36 2005/07/16 17:50:58 jstembridge Exp $
+ * $Id: demux_matroska.c,v 1.37 2005/07/29 17:57:00 jstembridge Exp $
*
* demultiplexer for matroska streams
*
@@ -1143,7 +1143,13 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) {
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_MPEG4_AP)) {
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_MSMPEG4V3)) {
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_MPEG1)) {
+ lprintf("MATROSKA_CODEC_ID_V_MPEG1\n");
+ track->buf_type = BUF_VIDEO_MPEG;
+ init_codec = init_codec_video;
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_MPEG2)) {
+ lprintf("MATROSKA_CODEC_ID_V_MPEG2\n");
+ track->buf_type = BUF_VIDEO_MPEG;
+ init_codec = init_codec_video;
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_REAL_RV10)) {
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_REAL_RV20)) {
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_V_REAL_RV30)) {