aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-05-22 01:41:32 +0000
committerDavid Conrad <lessen42@gmail.com>2010-05-22 01:41:32 +0000
commit470491faed80883d9e5d50715947a880f040c5be (patch)
tree98b7ea3293035da4076c66430226637cbcf17c16 /doc
parent6a2c9b8bcbbc3e892abd1c63ad322bac7d5d4989 (diff)
downloadffmpeg-470491faed80883d9e5d50715947a880f040c5be.tar.gz
matroskadec: Support webm doctype
Patch by James Zern <jzern at google> Originally committed as revision 23245 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 1bfde02bc2..bb199f6501 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -234,6 +234,7 @@ library:
@item VC-1 test bitstream @tab X @tab X
@item WAV @tab X @tab X
@item WavPack @tab @tab X
+@item WebM @tab @tab X
@item Wing Commander III movie @tab @tab X
@tab Multimedia format used in Origin's Wing Commander III computer game.
@item Westwood Studios audio @tab @tab X