From 1fce02557e9a785f016ebdefe903872ead73715b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Nov 2004 09:28:05 +0000 Subject: [PATCH] DivX is MPEG4, so let's call it MPEG4 to avoid confusion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13962 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/documentation.xml | 6 +++--- DOCS/xml/en/faq.xml | 2 +- DOCS/xml/en/formats.xml | 6 ++++-- DOCS/xml/en/video.xml | 16 +++++++++------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index fb3e89f77f..443e22ee59 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -61,8 +61,8 @@ many other Unices, and non-x86 CPUs, see QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA, Matroska files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora, and -DivX movies too. Another big feature of -MPlayer is the wide range of +MPEG4 (DivX) movies too. Another big +feature of MPlayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, DirectFB, but you can use GGI and SDL (and this way all their drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and @@ -93,7 +93,7 @@ Encoder) is a simple movie encoder, designed to encode MPlayer-playable movies (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA) to other MPlayer-playable formats (see below). It -can encode with various codecs, like DivX4 +can encode with various codecs, like MPEG4 (DivX4) (1 or 2 passes), libavcodec, PCM/MP3/VBR MP3 audio. diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml index 24dd58bbd7..69109c996b 100644 --- a/DOCS/xml/en/faq.xml +++ b/DOCS/xml/en/faq.xml @@ -1420,7 +1420,7 @@ movie on any CD. Check if you have libmp3lame installed properly. -I can't encode ASF files to AVI/DivX because it uses 1000 fps? +I can't encode ASF files to AVI/MPEG4 (DivX) because it uses 1000 fps? Because ASF uses variable frame rate but AVI uses a fixed one, you diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml index a4f102444e..f200d8502d 100644 --- a/DOCS/xml/en/formats.xml +++ b/DOCS/xml/en/formats.xml @@ -13,7 +13,8 @@ popular belief such a file can contain MPEG1 video. You see, a codec is not the same as a file format. -Examples of video codecs are: MPEG1, MPEG2, DivX, Indeo5, 3ivx. +Examples of video codecs are: MPEG1, MPEG2, +MPEG4 (DivX), Indeo5, 3ivx. Examples of file formats are: MPG, AVI, ASF. @@ -260,7 +261,8 @@ its .NUV files (only NuppelVideo 5.0). Those files can contain uncompressed YV12, YV12+RTJpeg compressed, YV12 RTJpeg+lzo compressed, and YV12+lzo compressed frames. MPlayer decodes (and also encodes -them with MEncoder to DivX/etc!) them all. Seeking works. +them with MEncoder to MPEG4 (DivX)/etc!) them all. +Seeking works. diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index 3b764deab7..231a25be88 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -1758,14 +1758,14 @@ NTSC. You must rescale for other heights by add option. DVB cards accept various widths, like 720, 704, 640, 512, 480, 352 etc and do hardware scaling in horizontal direction, so you do not need to scale horizontally in most cases. For a 512x384 (aspect 4:3) -DivX try: +MPEG4 (DivX) try: mplayer -ao mpegpes -vo mpegpes -vf scale=512:576 If you have a widescreen movie and you do not want to scale it to full height, you can use the filter to add black bands. To view a -640x384 DivX, try: +640x384 MPEG4 (DivX), try: @@ -1773,7 +1773,9 @@ you can use the filter to add black bands. To view a -If your CPU is too slow for a full size 720x576 DivX, try downscaling: + +If your CPU is too slow for a full size 720x576 MPEG4 (DivX), try downscaling: + mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 file.avi @@ -1803,7 +1805,7 @@ In order to play non-25fps movies on a PAL TV or with a slow CPU, add the -To keep the aspect ratio of DivX files and get the optimal scaling +To keep the aspect ratio of MPEG4 (DivX) files and get the optimal scaling parameters (hardware horizontal scaling and software vertical scaling while keeping the right aspect ratio), use the new dvbscale filter: @@ -2043,7 +2045,7 @@ rate of the movie. norm = 0 (default) does not change the current norm. = device number to use if you have more than one em8300 card. Any of these options may be left out. - seems to work great when playing DivX movies. People + seems to work great when playing MPEG4 (DivX) movies. People have reported problems using the prebuf option when playing MPEG1/2 files. You might want to try running without any options first, if you have sync problems, or DVD subtitle problems, give a try. @@ -2071,8 +2073,8 @@ This does not work with digital audio output (). -To watch non-MPEG content on the em8300 (i.e. DivX or RealVideo) you have to -specify an MPEG1 video filter such as +To watch non-MPEG content on the em8300 (i.e. MPEG4 (DivX) or RealVideo) +you have to specify an MPEG1 video filter such as libavcodec (lavc) or libfame (fame). At the moment lavc is both faster and gives better image quality, it is suggested