[MPlayer-cvslog] r31329 - in trunk/libmpdemux: demux_mkv.c matroska.h

[reimar]

Author: reimar
Date: Sat Jun  5 19:32:11 2010
New Revision: 31329

Log:
Add webm/VP8 support to native matroska demuxer.
Patch by James Zern [jzern google com]

Modified:
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/matroska.h

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Sat Jun  5 18:46:25 2010	(r31328)
+++ trunk/libmpdemux/demux_mkv.c	Sat Jun  5 19:32:11 2010	(r31329)
@@ -1461,6 +1461,7 @@ static const videocodec_info_t vinfo[] =
     {MKV_V_MPEG4_AP,  mmioFOURCC('m', 'p', '4', 'v'), 1},
     {MKV_V_MPEG4_AVC, mmioFOURCC('a', 'v', 'c', '1'), 1},
     {MKV_V_THEORA,    mmioFOURCC('t', 'h', 'e', 'o'), 1},
+    {MKV_V_VP8,       mmioFOURCC('V', 'P', '8', '0'), 0},
     {NULL, 0, 0}
 };
 
@@ -1941,7 +1942,7 @@ static int demux_mkv_open(demuxer_t *dem
 
     stream_seek(s, s->start_pos);
     str = ebml_read_header(s, &version);
-    if (str == NULL || strcmp(str, "matroska") || version > 2) {
+    if (str == NULL || (strcmp(str, "matroska") && strcmp(str, "webm")) || version > 2) {
         mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n");
         return 0;
     }

Modified: trunk/libmpdemux/matroska.h
==============================================================================
--- trunk/libmpdemux/matroska.h	Sat Jun  5 18:46:25 2010	(r31328)
+++ trunk/libmpdemux/matroska.h	Sat Jun  5 19:32:11 2010	(r31329)
@@ -69,6 +69,7 @@
 #define MKV_V_MPEG4_AP   "V_MPEG4/ISO/AP"
 #define MKV_V_MPEG4_AVC  "V_MPEG4/ISO/AVC"
 #define MKV_V_THEORA     "V_THEORA"
+#define MKV_V_VP8        "V_VP8"
 
 #define MKV_S_TEXTASCII  "S_TEXT/ASCII"
 #define MKV_S_TEXTUTF8   "S_TEXT/UTF8"