Mercurial > mplayer.hg
changeset 23271:85ad4dd0e439
Support theora in mkv. Sample: http://samples.mplayerhq.hu/Matroska/theora.mkv
author | reimar |
---|---|
date | Thu, 10 May 2007 14:01:53 +0000 |
parents | f094c9256137 |
children | fde0ba67740f |
files | libmpdemux/demux_mkv.c libmpdemux/matroska.h |
diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c Thu May 10 13:58:57 2007 +0000 +++ b/libmpdemux/demux_mkv.c Thu May 10 14:01:53 2007 +0000 @@ -1811,6 +1811,7 @@ { MKV_V_MPEG4_ASP, mmioFOURCC('m', 'p', '4', 'v'), 1 }, { 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 }, { NULL, 0, 0 } };
--- a/libmpdemux/matroska.h Thu May 10 13:58:57 2007 +0000 +++ b/libmpdemux/matroska.h Thu May 10 14:01:53 2007 +0000 @@ -52,6 +52,7 @@ #define MKV_V_MPEG4_ASP "V_MPEG4/ISO/ASP" #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_S_TEXTASCII "S_TEXT/ASCII" #define MKV_S_TEXTUTF8 "S_TEXT/UTF8"