diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 20:12:47 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 20:17:24 +0200 |
commit | 7e944159c63c4d4504cf76f90bb668519c3109af (patch) | |
tree | 99c916277e5523ae607f50cdde69030513b70d39 /doc/platform.texi | |
parent | 281bde27894f994d0982ab9283f15d6073ae352c (diff) | |
parent | 100c70b0481b889d522b4fc2aac5b948ddb05c70 (diff) | |
download | ffmpeg-7e944159c63c4d4504cf76f90bb668519c3109af.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
vcr1: Add vcr1_ prefixes to all static functions with generic names.
vcr1: Fix return type of common_init to match the function pointer signature.
vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
motion-test: remove disabled code
gxfenc: remove disabled half-implemented MJPEG tag
x86: use more standard construct for setting ASM functions in FFT code
fate: westwood-aud: disable decoding
fate: caf: disable decoding
fate: film-cvid: drop pcm audio and rename test
fate: d-cinema-demux: drop unnecessary flags
fate: split off dpcm-interplay from interplay-mve tests
fate: rename funcom-iss to adpcm-ima-iss
fate: rename cryo-apc to adpcm-ima-apc
fate: rename adpcm-psx-str-v3 to adpcm-xa
fate: split off adpcm-ms-mono test from dxa-feeble
fate: split off adpcm-ima-ws test from vqa-cc
fate: add adpcm-ima-smjpeg test
fate: split off adpcm-ima-amv from amv test
fate: separate bmv audio and video tests
fate: separate delphine-cin audio and video tests
...
Conflicts:
doc/platform.texi
libavcodec/vcr1.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
tests/ref/fate/ea-mad-pcm-planar
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mtv
tests/ref/fate/qtrle-1bit
tests/ref/fate/qtrle-2bit
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/vqa-cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
-rw-r--r-- | doc/platform.texi | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index d1a1f94481..d0db8aed62 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -89,7 +89,7 @@ section and the FAQ. FFmpeg does not build out-of-the-box with the packages the automated MinGW installer provides. It also requires coreutils to be installed and many other -packages updated to the latest version. The minimum version for some packages +packages updated to the latest version. The minimum versions for some packages are listed below: @itemize @@ -109,14 +109,11 @@ Notes: @item Building natively using MSYS can be sped up by disabling implicit rules in the Makefile by calling @code{make -r} instead of plain @code{make}. This speed up is close to non-existent for normal one-off builds and is only -noticeable when running make for a second time (for example in +noticeable when running make for a second time (for example during @code{make install}). @item In order to compile FFplay, you must have the MinGW development library -of @uref{http://www.libsdl.org/, SDL}. -Edit the @file{bin/sdl-config} script so that it points to the correct prefix -where SDL was installed. Verify that @file{sdl-config} can be launched from -the MSYS command line. +of @uref{http://www.libsdl.org/, SDL} and @code{pkg-config} installed. @item By using @code{./configure --enable-shared} when configuring FFmpeg, you can build the FFmpeg libraries (e.g. libavutil, libavcodec, @@ -140,7 +137,7 @@ you might have to modify the procedures slightly. @subsection Using static libraries -Assuming you have just built and installed FFmpeg in @file{/usr/local}. +Assuming you have just built and installed FFmpeg in @file{/usr/local}: @enumerate @@ -288,14 +285,11 @@ are stored. @item Generate new import libraries with @file{lib.exe}: @example -lib /machine:i386 /def:..\lib\avcodec-53.def /out:avcodec.lib -lib /machine:i386 /def:..\lib\avdevice-53.def /out:avdevice.lib -lib /machine:i386 /def:..\lib\avfilter-2.def /out:avfilter.lib -lib /machine:i386 /def:..\lib\avformat-53.def /out:avformat.lib -lib /machine:i386 /def:..\lib\avutil-51.def /out:avutil.lib -lib /machine:i386 /def:..\lib\swscale-2.def /out:swscale.lib +lib /machine:i386 /def:..\lib\foo-version.def /out:foo.lib @end example +Replace @code{foo-version} and @code{foo} with the respective library names. + @end enumerate @anchor{Cross compilation for Windows with Linux} @@ -337,8 +331,8 @@ Then run to make a static build. -The current @code{gcc4-core} package is buggy and needs this flag to build -shared libraries: +To build shared libraries add a special compiler flag to work around current +@code{gcc4-core} package bugs in addition to the normal configure flags: @example ./configure --enable-shared --disable-static --extra-cflags=-fno-reorder-functions @@ -358,11 +352,8 @@ yasm, libSDL-devel, libfaac-devel, libaacplus-devel, libgsm-devel, libmp3lame-de libschroedinger1.0-devel, speex-devel, libtheora-devel, libxvidcore-devel @end example -The recommendation for libnut and x264 is to build them from source by -yourself, as they evolve too quickly for Cygwin Ports to be up to date. - -Cygwin 1.7.x has IPv6 support. You can add IPv6 to Cygwin 1.5.x by means -of the @code{libgetaddrinfo-devel} package, available at Cygwin Ports. +The recommendation for x264 is to build it from source, as it evolves too +quickly for Cygwin Ports to be up to date. @section Crosscompilation for Windows under Cygwin |