diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-10 14:01:53 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-10 14:01:53 +0000 |
| commit | 4ffc4db9da4fd5f55dc149dceff3f350e2b78aa4 (patch) | |
| tree | baef90abd0aea5764b864e8b743a9d3d348f358c /libmpdemux | |
| parent | 8073174ddb97fe8666d8e5bd2062fde22f7f3a6e (diff) | |
| download | mpv-4ffc4db9da4fd5f55dc149dceff3f350e2b78aa4.tar.bz2 mpv-4ffc4db9da4fd5f55dc149dceff3f350e2b78aa4.tar.xz | |
Support theora in mkv. Sample: http://samples.mplayerhq.hu/Matroska/theora.mkv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23289 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 1 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 292f5b97b2..dabcd7e5e0 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1811,6 +1811,7 @@ static const videocodec_info_t vinfo[] = { { 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 } }; diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 3656076087..4dede9255b 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -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" |