summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-10-27 22:07:56 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-10-27 22:07:56 +0000
commit60837265bccd233f1882ea310d620a45808b69e9 (patch)
treedc57999248d65fe4c9dfe513f2030d1ede239447 /doc
parent9181577ccb1ddcb3d256b533de2badd0a4fd83e9 (diff)
added Michael's page
Originally committed as revision 1086 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.html6
-rw-r--r--doc/ffmpeg-doc.texi4
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.html b/doc/ffmpeg-doc.html
index 2852fa5e56..262a8314a9 100644
--- a/doc/ffmpeg-doc.html
+++ b/doc/ffmpeg-doc.html
@@ -643,6 +643,12 @@ library.
<CODE>X</CODE> means that the encoding (resp. decoding) is supported.
+<P>
+Check at <A HREF="http://www.mplayerhq.hu/~michael/codec-features.html">http://www.mplayerhq.hu/~michael/codec-features.html</A> to
+get a precise comparison of FFmpeg MPEG4 codec compared to the other
+solutions.
+
+
<H2><A NAME="SEC16" HREF="ffmpeg-doc.html#TOC16">5.3 Audio Codecs</A></H2>
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 833f49cd14..beb5a9a5cc 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -376,6 +376,10 @@ library.
@code{X} means that the encoding (resp. decoding) is supported.
+Check at @url{http://www.mplayerhq.hu/~michael/codec-features.html} to
+get a precise comparison of FFmpeg MPEG4 codec compared to the other
+solutions.
+
@section Audio Codecs
@multitable @columnfractions .4 .1 .1 .1 .7