summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-02-22 10:47:16 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-02-22 10:47:16 +0000
commita9d3c6692ef9cd931fd082ca28f7b4738e211363 (patch)
tree9b89bb19d27044afd3e58a4fe33e532cee5e78cb /doc
parent66e6038cf1459304ed92305b8f3e61e2f45e8fc7 (diff)
mention MXF D-10 Mapping muxer in documentation
Originally committed as revision 17521 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 720d020fbf..71b64c3e23 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -127,6 +127,8 @@ library:
@item Musepack SV8 @tab @tab X
@item Material eXchange Format (MXF) @tab X @tab X
@tab SMPTE 377M, used by D-Cinema, broadcast industry.
+@item Material eXchange Format (MXF), D-10 Mapping @tab X @tab X
+ @tab SMPTE 386M, D-10/IMX Mapping.
@item NC camera feed @tab @tab X
@tab NC (AVIP NC4600) camera streams
@item Nullsoft Streaming Video @tab @tab X