summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-05-25 18:20:59 +0000
committerReinhard Tartler <siretart@tauware.de>2010-05-25 18:20:59 +0000
commit9d3bb3501de9c9221c90a5ef22ba899e29fbd231 (patch)
tree7a6ebdff0eb1d11dab5a1e2d2f21c2589b9c9023 /doc
parent0b374e40b1df87d21c6870e998849dd51027c637 (diff)
matroskadec: Support webm doctype
Patch by James Zern <jzern at google> backport r23245 by conrad Originally committed as revision 23313 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
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