diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-05 17:32:11 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-05 17:32:11 +0000 |
| commit | bb90bfbd08d463a4789043fa0763350eb59d4730 (patch) | |
| tree | 0784dc19ed6fd9c991d0da3d204e11e58273e078 | |
| parent | 09bca6575f66394e1f4ba3845330d21d30895f3d (diff) | |
| download | mpv-bb90bfbd08d463a4789043fa0763350eb59d4730.tar.bz2 mpv-bb90bfbd08d463a4789043fa0763350eb59d4730.tar.xz | |
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
| -rw-r--r-- | libmpdemux/demux_mkv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index ed9f40b1ad..4c423409c5 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -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; } diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 3e569453c2..c8c289d060 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -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" |