Commit 988a9f9e authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

doc update

Originally committed as revision 2285 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 211f2123
......@@ -14,7 +14,6 @@ Short term:
- clean up (incompatible change, for 0.5.0):
* AVStream -> AVComponent
* AVFormatContext -> AVInputStream/AVOutputStream
* CODEC_ID_MP3LAME and CODEC_ID_MP2 -> CODEC_ID_MPEGAUDIO
* suppress rate_emu from AVCodecContext
- add av_log() in libavcodec and suppress all printf
- add new float/integer audio filterting and conversion : suppress
......
......@@ -69,11 +69,12 @@ No. Only GCC is supported. GCC is ported on most systems available and I
don't see the need to pollute the source code with @code{#ifdef}s
related to the compiler.
@section I want to use ffmpeg or libavcodec under Windows. Can you support my proprietary C compiler XXX ?
@section Can I use FFmpeg or libavcodec under Windows ?
No. Use @code{mingw-gcc} available at @url{http://www.mingw.org/} to
compile the code. It generates object files fully compatible with other
windows compilers.
Yes, but the MinGW tools @emph{must} be used to compile FFmpeg. You
can link the resulting DLLs with any other Windows program. Read the
@emph{Native Windows Compilation} section in the FFmpeg documentation
to have more information.
@section Can you add automake, libtool or autoconf support ?
......
......@@ -754,7 +754,8 @@ the MinGW development library of SDL 1.2.x
(@file{SDL-devel-1.2.x-mingw32.tar.gz}) from
@url{http://www.libsdl.org}. Unpack it in a temporary place, and
unpack the archive @file{i386-mingw32msvc.tar.gz} in the MinGW tool
directory.
directory. Edit the @file{sdl-config} script so that it gives the
correct SDL directory when invoked.
@item Extract the current version of FFmpeg (the latest release version or the current CVS snapshot whichever is recommended).
......@@ -766,15 +767,31 @@ directory.
suffices. If you have problems using SDL, verify that
@file{sdl-config} can be launched from the MSYS command line.
@item You can install FFmpeg in @file{Program Files/FFmpeg} by typing @file{make install}.
@item You can install FFmpeg in @file{Program Files/FFmpeg} by typing @file{make install}. Don't forget to copy @file{SDL.dll} at the place you launch
@file{ffplay}.
@end itemize
Note: The target @file{make wininstaller} can be used to create a Nullsoft based Windows installer for FFmpeg and FFplay.
Notes:
@itemize
@subsection How to create a single Windows DLL from libavcodec and libavformat
Read @url{http://ffmpeg.org/win32.html}.
@item The target @file{make wininstaller} can be used to create a
Nullsoft based Windows installer for FFmpeg and FFplay. @file{SDL.dll}
must be copied in the ffmpeg directory in order to build the
installer.
@item By using @code{./configure --enable-shared} when configuring ffmpeg,
you can build @file{avcodec.dll} and @file{avformat.dll}. With
@code{make install} you install the FFmpeg DLLs and the associated
headers in @file{Program Files/FFmpeg}.
@item Visual C++ compatibility: if you used @code{./configure --enable-shared}
when configuring FFmpeg, then FFmpeg tries to use the Microsoft Visual
C++ @code{lib} tool to build @code{avcodec.lib} and
@code{avformat.lib}. With these libraries, you can link your Visual C++
code directly with the FFmpeg DLLs.
@end itemize
@subsection Cross compilation for Windows with Linux
......
......@@ -43,6 +43,12 @@ disable video
disable graphical display
@item -f fmt
force format
@item -img img_fmt
this option is used to force a given image format
when playing image sequences. Example:
@example
ffplay -img pgmyuv tests/vsynth1/%d.pgm
@end example
@end table
@section Advanced options
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment