Mercurial > mplayer.hg
diff libmpdemux/demux_mkv.c @ 31263:6428a4b38763
Add webm/VP8 support to native matroska demuxer.
Patch by James Zern [jzern google com]
author | reimar |
---|---|
date | Sat, 05 Jun 2010 17:32:11 +0000 |
parents | 8314717ef431 |
children | 31eb98126392 |
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c Sat Jun 05 16:46:25 2010 +0000 +++ b/libmpdemux/demux_mkv.c Sat Jun 05 17:32:11 2010 +0000 @@ -1461,6 +1461,7 @@ {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 @@ 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; }