diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-09-02 04:52:16 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-09-02 04:52:16 +0000 |
| commit | 8a5483e7c4b26e1886026e0e1deed34253c757f5 (patch) | |
| tree | b1ddbfc8368de0ee3bd60b3425a034da270c3cc9 /doc | |
| parent | 4d3b1f8da7470593e1450a8822eb1266e26a71d3 (diff) | |
it seems that ffmpeg can also mux QT/MP4 now
Originally committed as revision 2197 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index ba968578a0..72f04ee2fb 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -614,8 +614,8 @@ library: @item Raw MPEG video @tab X @tab X @item Raw PCM8/16 bits, mulaw/Alaw@tab X @tab X @item SUN AU format @tab X @tab X -@item Quicktime @tab @tab X -@item MPEG4 @tab @tab X +@item Quicktime @tab X @tab X +@item MPEG4 @tab X @tab X @tab MPEG4 is a variant of Quicktime @item Raw MPEG4 video @tab X @tab X @item DV @tab @tab X |