summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2014-03-11 16:24:55 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-04-06 16:41:41 +0200
commiteeadcdfd1a6f3089b6bf6e194d6ece8d3f113123 (patch)
tree39b9efe55db7336fedf796f3a7f5812ce1998ef5 /doc
parent6f273093e54cba130f3ffde3d6433e74baa4ad89 (diff)
downloadffmpeg-streaming-eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123.zip
ffmpeg-streaming-eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123.tar.gz
LucasArts SMUSH demuxer
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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 66844a6..f1287cf 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -383,6 +383,8 @@ library:
@tab Multimedia format used by many games.
@item SMJPEG @tab X @tab X
@tab Used in certain Loki game ports.
+@item Smush
+ @tab Multimedia format used in some LucasArts games.
@item Sony OpenMG (OMA) @tab X @tab X
@tab Audio format used in Sony Sonic Stage and Sony Vegas.
@item Sony PlayStation STR @tab @tab X
OpenPOWER on IntegriCloud