RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Add webm/VP8 support to native matroska demuxer. 

Patch by James Zern [jzern google com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31329 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-06-05 17:32:11 +00:00
parent 09bca6575f
commit bb90bfbd08
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmpdemux/demux_mkv.c
View File

@ -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 *demuxer)
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;
}

1
libmpdemux/matroska.h
View File

@ -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"