summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/Hungarian/documentation.html1
-rw-r--r--DOCS/Hungarian/formats.html13
-rw-r--r--DOCS/documentation.html1
-rw-r--r--DOCS/formats.html8
4 files changed, 21 insertions, 2 deletions
diff --git a/DOCS/Hungarian/documentation.html b/DOCS/Hungarian/documentation.html
index e736fae7b1..1e75fa00a0 100644
--- a/DOCS/Hungarian/documentation.html
+++ b/DOCS/Hungarian/documentation.html
@@ -42,6 +42,7 @@
<LI><A HREF="formats.html#2.1.1.6">2.1.1.6 FLI file-ok</A></LI>
<LI><A HREF="formats.html#2.1.1.7">2.1.1.7 RealMedia file-ok</A></LI>
<LI><A HREF="formats.html#2.1.1.8">2.1.1.8 NuppelVideo file-ok</A></LI>
+ <LI><A HREF="formats.html#2.1.1.9">2.1.1.9 yuv4mpeg file-ok</A></LI>
</UL>
<LI><A HREF="formats.html#2.1.2">2.1.2 Audio</A></LI>
</UL>
diff --git a/DOCS/Hungarian/formats.html b/DOCS/Hungarian/formats.html
index 6044275fee..73dd8d97b0 100644
--- a/DOCS/Hungarian/formats.html
+++ b/DOCS/Hungarian/formats.html
@@ -16,8 +16,10 @@
<LI><A HREF="#2.1.1.3">ASF/WMV</A> 1.0 formátum
<LI><A HREF="#2.1.1.4">QT/MOV</A> formátum
<LI><A HREF="#2.1.1.5">VIVO</A> formátum (.viv fileok)
-<LI><A HREF="#2.1.1.5">FLI</A> formátum
-<LI><A HREF="#2.1.1.5">RealMedia</A> formátum (.rm fileok)
+<LI><A HREF="#2.1.1.6">FLI</A> formátum
+<LI><A HREF="#2.1.1.7">RealMedia</A> formátum (.rm fileok)
+<LI><A HREF="#2.1.1.8">NuppelVideo</A> formátum (.nuv fileok)
+<LI><A HREF="#2.1.1.9">yuv4mpeg</A> formátum
<LI>file olvasása <A HREF="documentation.html#3.3">standard bemenetről</A>, hálózatról HTTP-n keresztül
</UL></P>
@@ -193,6 +195,13 @@ Természetesen lehetséges ezen file-ok <B>MEncoder</B>-rel történő DivX-be
(vagy bármibe) tömörítése. A seekelés még nincs implementálva.</P>
+<P><B><A NAME=2.1.1.9>2.1.1.9. yuv4mpeg file-ok</A></B></P>
+
+<P>A <A HREF="http://mjpeg.sourceforge.net">yuv4mpeg / yuv4mpeg2</A> is egy
+TV grabbeléshez kitalált formátum, vagy ilyesmi :) Egy dolgot tudok róla:
+támogatjuk.</P>
+
+
<P><B><A NAME=2.1.2>2.1.2. Audio formátumok</A></B></P>
<P>Jelenleg az <B>MPlayer</B> még mindig egy <B>Movie</B> (film) és nem
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index c44bb68eb5..c1be54daea 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -42,6 +42,7 @@
<LI><A HREF="formats.html#2.1.1.6">2.1.1.6 FLI files</A></LI>
<LI><A HREF="formats.html#2.1.1.7">2.1.1.7 RealMedia files</A></LI>
<LI><A HREF="formats.html#2.1.1.8">2.1.1.8 NuppelVideo files</A></LI>
+ <LI><A HREF="formats.html#2.1.1.9">2.1.1.9 yuv4mpeg files</A></LI>
</UL>
<LI><A HREF="formats.html#2.1.2">2.1.2 Audio</A></LI>
</UL>
diff --git a/DOCS/formats.html b/DOCS/formats.html
index 210e54c700..7b918e77b8 100644
--- a/DOCS/formats.html
+++ b/DOCS/formats.html
@@ -19,6 +19,7 @@
<LI> <A HREF="#2.1.1.6">FLI</A> format
<LI> <A HREF="#2.1.1.7">RealMedia</A> format (.rm files)
<LI> <A HREF="#2.1.1.8">NuppelVideo</A> format (.nuv files)
+<LI> <A HREF="#2.1.1.9">yuv4mpeg</A> format
<LI> supports <A HREF="documentation.html#3.3">reading from stdin</A>, or network via HTTP
</UL></P>
@@ -185,6 +186,13 @@ frames, <B>MPlayer</B> decodes (and also <B>encodes</B> them with MEncoder to
DivX/etc!) them all. Seeking is under implementation.</P>
+<P><B><A NAME=2.1.1.9>2.1.1.9. yuv4mpeg files</A></B></P>
+
+<P><A HREF="http://mjpeg.sourceforge.net">yuv4mpeg / yuv4mpeg2</A> is
+also a fileformat for TV grabbing, or so :) I know only one thing about it:
+we support it.</P>
+
+
<P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>
<P>Currently <B>MPlayer</B> is still a <B>Movie</B> and not a <B>Media</B>