aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authoranatoly <anatoly.nenashev@ovsoft.ru>2011-03-28 20:02:19 +0400
committerMichael Niedermayer <michaelni@gmx.at>2011-04-26 22:06:13 +0200
commit75cf2602c74c3e9794620048ad841a5b18219db5 (patch)
treed01c57154e0080e8fd594ac20b73aadbf1c07a97 /doc/general.texi
parentdd1e5bfd5e402d3c455c3a349d6554bf07c88f92 (diff)
downloadffmpeg-75cf2602c74c3e9794620048ad841a5b18219db5.tar.gz
Add MxPEG decoder
Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 7d0afd5050..e4b9bd32ac 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -446,6 +446,7 @@ following image formats are supported:
@item Miro VideoXL @tab @tab X
@tab fourcc: VIXL
@item MJPEG (Motion JPEG) @tab X @tab X
+@item Mobotix MxPEG video @tab @tab X
@item Motion Pixels video @tab @tab X
@item MPEG-1 video @tab X @tab X
@item MPEG-1/2 video XvMC (X-Video Motion Compensation) @tab @tab X