@@ -820,7 +820,7 @@ HTML_STYLESHEET        =

 # 180 is cyan, 240 is blue, 300 purple, and 360 is red again.

 # The allowed range is 0 to 359.

-HTML_COLORSTYLE_HUE    = 220

+HTML_COLORSTYLE_HUE    = 120

 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of

 # the colors in the HTML output. For a value of 0 the output will use

@@ -3,8 +3,11 @@ PODPAGES    = $(PROGS-yes:%=doc/%.pod)

 HTMLPAGES   = $(PROGS-yes:%=doc/%.html)                                 \

               doc/developer.html                                        \

               doc/faq.html                                              \

+              doc/fate.html                                             \

               doc/general.html                                          \

+              doc/git-howto.html                                        \

               doc/libavfilter.html                                      \

+              doc/platform.html                                         \

 DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)

@@ -132,8 +132,8 @@ libavcodec libraries. To see the list of available AVOptions, use the

 @option{-help} option. They are separated into two categories:

 @table @option

 @item generic

-These options can be set for any container, codec or device. Generic options are

-listed under AVFormatContext options for containers/devices and under

+These options can be set for any container, codec or device. Generic options

+are listed under AVFormatContext options for containers/devices and under

 AVCodecContext options for codecs.

 @item private

 These options are specific to the given container, device or codec. Private

@@ -150,8 +150,8 @@ ffmpeg -i input.flac -id3v2_version 3 out.mp3

 All codec AVOptions are obviously per-stream, so the chapter on stream

 specifiers applies to them

-Note -nooption syntax cannot be used for boolean AVOptions, use -option

-0/-option 1.

+Note @option{-nooption} syntax cannot be used for boolean AVOptions,

+use @option{-option 0}/@option{-option 1}.

 Note2 old undocumented way of specifying per-stream AVOptions by prepending

 v/a/s to the options name is now obsolete and will be removed soon.

@@ -34,7 +34,7 @@ JPEG image. The individual frames can be extracted without loss,

 e.g. by

 @example

-ffmpeg -i ../some_mjpeg.avi -vcodec copy frames_%d.jpg

+ffmpeg -i ../some_mjpeg.avi -c:v copy frames_%d.jpg

 @end example

 Unfortunately, these chunks are incomplete JPEG images, because

@@ -57,9 +57,9 @@ stream (carrying the AVI1 header ID and lacking a DHT segment) to

 produce fully qualified JPEG images.

 @example

-ffmpeg -i mjpeg-movie.avi -vcodec copy -vbsf mjpeg2jpeg frame_%d.jpg

+ffmpeg -i mjpeg-movie.avi -c:v copy -vbsf mjpeg2jpeg frame_%d.jpg

 exiftran -i -9 frame*.jpg

-ffmpeg -i frame_%d.jpg -vcodec copy rotated.avi

+ffmpeg -i frame_%d.jpg -c:v copy rotated.avi

 @end example

 @section mjpega_dump_header

@@ -49,19 +49,19 @@ sequence of filenames of the form @file{i%m%g-1.jpg},

 The size, the pixel format, and the format of each image must be the

 same for all the files in the sequence.

-The following example shows how to use @file{ffmpeg} for creating a

+The following example shows how to use @command{ffmpeg} for creating a

 video from the images in the file sequence @file{img-001.jpeg},

 @file{img-002.jpeg}, ..., assuming an input frame rate of 10 frames per

 second:

 @example

-ffmpeg -r 10 -f image2 -i 'img-%03d.jpeg' out.avi

+ffmpeg -i 'img-%03d.jpeg' -r 10 out.mkv

 @end example

 Note that the pattern must not necessarily contain "%d" or

 "%0@var{N}d", for example to convert a single image file

 @file{img.jpeg} you can employ the command:

 @example

-ffmpeg -f image2 -i img.jpeg img.png

+ffmpeg -i img.jpeg img.png

 @end example

 @section applehttp

new file mode 100644

@@ -0,0 +1,135 @@

+\input texinfo @c -*- texinfo -*-

+

+@settitle FATE Automated Testing Environment

+@titlepage

+@center @titlefont{FATE Automated Testing Environment}

+@end titlepage

+

+@top

+

+@contents

+

+@chapter Introduction

+

+FATE provides a regression testsuite embedded within the FFmpeg build system.

+It can be run locally and optionally configured to send reports to a web

+aggregator and viewer @url{http://fate.ffmpeg.org}.

+

+It is advised to run FATE before submitting patches to the current codebase

+and provide new tests when submitting patches to add additional features.

+

+@chapter Running FATE

+

+@section Samples and References

+In order to run, FATE needs a large amount of data (samples and references)

+that is provided separately from the actual source distribution.

+

+To inform the build system about the testsuite location, pass

+@option{--samples=<path to the samples>} to @command{configure} or set the

+@var{SAMPLES} Make variable or the @var{FATE_SAMPLES} environment variable

+to a suitable value.

+

+The dataset is available through @command{rsync}, is possible to fetch

+the current sample using the straight rsync command or through a specific

+@ref{Makefile target}.

+

+@example

+# rsync -aL rsync://fate.ffmpeg.org/fate-suite/ fate-suite

+@end example

+

+@example

+# make fate-rsync SAMPLES=fate-suite

+@end example

+

+

+@chapter Manual Run

+FATE regression test can be run through @command{make}.

+Specific Makefile targets and Makefile variables are available:

+

+@anchor{Makefile target}

+@section FATE Makefile targets

+@table @option

+@item fate-list

+List all fate/regression test targets.

+@item fate-rsync

+Shortcut to download the fate test samples to the specified testsuite location.

+@item fate

+Run the FATE test suite (requires the fate-suite dataset).

+@end table

+

+@section Fate Makefile variables

+@table @option

+@item V

+Verbosity level, can be set to 0, 1 or 2.

+@table @option

+    @item 0

+    show just the test arguments

+    @item 1

+    show just the command used in the test

+    @item 2

+    show everything

+@end table

+@item SAMPLES

+Specify or override the path to the FATE samples at make time, it has a

+meaning only while running the regression tests.

+@item THREADS

+Specify how many threads to use while running regression tests, it is

+quite useful to detect thread-related regressions.

+@end table

+

+@example

+    make V=1 SAMPLES=/var/fate/samples THREADS=2 fate

+@end example

+

+@chapter Automated Tests

+In order to automatically testing specific configurations, e.g. multiple

+compilers, @command{tests/fate.sh} is provided.

+

+This shell script builds FFmpeg, runs the regression tests and prepares a

+report that can be sent to @url{fate.ffmpeg.org} or directly examined locally.

+

+@section Testing Profiles

+The configuration file passed to @command{fate.sh} is shell scripts as well.

+

+It must provide at least a @var{slot} identifier, the @var{repo} from

+which fetch the sources, the @var{samples} directory, a @var{workdir} with

+enough space to build and run all the tests.

+Optional submit command @var{fate_recv} and a @var{comment} to describe

+the testing profile are available.

+

+Additional optional parameter to tune the FFmpeg building and reporting process

+can be passed.

+

+@example

+slot=                                   # some unique identifier

+repo=git://source.ffmpeg.org/ffmpeg.git # the source repository

+samples=/path/to/fate/samples

+workdir=                                # directory in which to do all the work

+fate_recv="ssh -T fate@fate.ffmpeg.org" # command to submit report

+comment=                                # optional description

+

+# the following are optional and map to configure options

+arch=

+cpu=

+cross_prefix=

+cc=

+target_os=

+sysroot=

+target_exec=

+target_path=

+extra_cflags=

+extra_ldflags=

+extra_libs=

+extra_conf=     # extra configure options not covered above

+

+#make=          # name of GNU make if not 'make'

+makeopts=       # extra options passed to 'make'

+#tar=           # command to create a tar archive from its arguments on

+                # stdout, defaults to 'tar c'

+@end example

+

+@section Submitting Reports

+In order to send reports you need to create an @command{ssh} key and send it

+to the fate server administrator.

+The current server fingerprint is @var{b1:31:c8:79:3f:04:1d:f8:f2:23:26:5a:fd:55:fa:92}

+

@@ -34,7 +34,7 @@ file.

 This documentation covers only the streaming aspects of ffserver /

 ffmpeg. All questions about parameters for ffmpeg, codec questions,

-etc. are not covered here. Read @file{ffmpeg-doc.html} for more

+etc. are not covered here. Read @file{ffmpeg.html} for more

 information.

 @section How does it work?

@@ -265,7 +265,7 @@ rather than as a daemon.

 @c man begin SEEALSO

-ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf}

+ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffserver.conf}

 example and the FFmpeg HTML documentation

 @c man end

@@ -9,7 +9,7 @@

 @contents

-@chapter external libraries

+@chapter External libraries

 FFmpeg can be hooked up with a number of external libraries to add support

 for more formats. None of them are used by default, their use has to be

@@ -23,20 +23,75 @@ instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp

 @file{./configure}.

-@section OpenCORE AMR

+@section OpenCORE and VisualOn libraries

-FFmpeg can make use of the OpenCORE libraries for AMR-NB

-decoding/encoding and AMR-WB decoding.

+Spun off Google Android sources, OpenCore and VisualOn libraries provide

+encoders for a number of audio codecs.

-Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the instructions for

-installing the libraries. Then pass @code{--enable-libopencore-amrnb} and/or

-@code{--enable-libopencore-amrwb} to configure to enable the libraries.

-

-Note that OpenCORE is under the Apache License 2.0 (see

-@url{http://www.apache.org/licenses/LICENSE-2.0} for details), which is

+@float NOTE

+OpenCORE and VisualOn libraries are under the Apache License 2.0

+(see @url{http://www.apache.org/licenses/LICENSE-2.0} for details), which is

 incompatible with the LGPL version 2.1 and GPL version 2. You have to

 upgrade FFmpeg's license to LGPL version 3 (or if you have enabled

 GPL components, GPL version 3) to use it.

+@end float

+

+@subsection OpenCORE AMR

+

+FFmpeg can make use of the OpenCORE libraries for AMR-NB

+decoding/encoding and AMR-WB decoding.

+

+Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the

+instructions for installing the libraries.

+Then pass @code{--enable-libopencore-amrnb} and/or

+@code{--enable-libopencore-amrwb} to configure to enable them.

+

+@subsection VisualOn AAC encoder library

+

+FFmpeg can make use of the VisualOn AACenc library for AAC encoding.

+

+Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the

+instructions for installing the library.

+Then pass @code{--enable-libvo-aacenc} to configure to enable it.

+

+@subsection VisualOn AMR-WB encoder library

+

+FFmpeg can make use of the VisualOn AMR-WBenc library for AMR-WB encoding.

+

+Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the

+instructions for installing the library.

+Then pass @code{--enable-libvo-amrwbenc} to configure to enable it.

+

+@section LAME

+

+FFmpeg can make use of the LAME library for MP3 encoding.

+

+Go to @url{http://lame.sourceforge.net/} and follow the

+instructions for installing the library.

+Then pass @code{--enable-libmp3lame} to configure to enable it.

+

+@section libvpx

+

+FFmpeg can make use of the libvpx library for VP8 encoding.

+

+Go to @url{http://www.webmproject.org/} and follow the instructions for

+installing the library. Then pass @code{--enable-libvpx} to configure to

+enable it.

+

+@section x264

+

+FFmpeg can make use of the x264 library for H.264 encoding.

+

+Go to @url{http://www.videolan.org/developers/x264.html} and follow the

+instructions for installing the library. Then pass @code{--enable-libx264} to

+configure to enable it.

+

+@float NOTE

+x264 is under the GNU Public License Version 2 or later

+(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for

+details), you must upgrade FFmpeg's license to GPL in order to use it.

+@end float

+

 @chapter Supported File Formats and Codecs

@@ -797,378 +852,4 @@ performance on systems without hardware floating point support).

 @code{X} means that input/output is supported.

-

-@chapter Platform Specific information

-

-@section DOS

-

-Using a cross-compiler is preferred for various reasons.

-

-@section OS/2

-

-For information about compiling FFmpeg on OS/2 see

-@url{http://www.edm2.com/index.php/FFmpeg}.

-

-@section Unix-like

-

-Some parts of FFmpeg cannot be built with version 2.15 of the GNU

-assembler which is still provided by a few AMD64 distributions. To

-make sure your compiler really uses the required version of gas

-after a binutils upgrade, run:

-

-@example

-$(gcc -print-prog-name=as) --version

-@end example

-

-If not, then you should install a different compiler that has no

-hard-coded path to gas. In the worst case pass @code{--disable-asm}

-to configure.

-

-@subsection BSD

-

-BSD make will not build FFmpeg, you need to install and use GNU Make

-(@file{gmake}).

-

-@subsection (Open)Solaris

-

-GNU Make is required to build FFmpeg, so you have to invoke (@file{gmake}),

-standard Solaris Make will not work. When building with a non-c99 front-end

-(gcc, generic suncc) add either @code{--extra-libs=/usr/lib/values-xpg6.o}

-or @code{--extra-libs=/usr/lib/64/values-xpg6.o} to the configure options

-since the libc is not c99-compliant by default. The probes performed by

-configure may raise an exception leading to the death of configure itself

-due to a bug in the system shell. Simply invoke a different shell such as

-bash directly to work around this:

-

-@example

-bash ./configure

-@end example

-

-@anchor{Darwin}

-@subsection Darwin (OSX, iPhone)

-

-The toolchain provided with Xcode is sufficient to build the basic

-unacelerated code.

-

-OSX on PowerPC or ARM (iPhone) requires a preprocessor from

-@url{http://github.com/yuvi/gas-preprocessor} to build the optimized

-assembler functions. Just download the Perl script and put it somewhere

-in your PATH, FFmpeg's configure will pick it up automatically.

-

-OSX on amd64 and x86 requires @command{yasm} to build most of the

-optimized assembler functions @url{http://mxcl.github.com/homebrew/, Homebrew},

-@url{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix}

-or @url{http://www.macports.org, MacPorts} can easily provide it.

-

-@section Windows

-

-To get help and instructions for building FFmpeg under Windows, check out

-the FFmpeg Windows Help Forum at

-@url{http://ffmpeg.arrozcru.org/}.

-

-@subsection Native Windows compilation

-

-FFmpeg can be built to run natively on Windows using the MinGW tools. Install

-the latest versions of MSYS and MinGW from @url{http://www.mingw.org/}.

-You can find detailed installation instructions in the download

-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

-are listed below:

-

-@itemize

-@item bash 3.1

-@item msys-make 3.81-2 (note: not mingw32-make)

-@item w32api 3.13

-@item mingw-runtime 3.15

-@end itemize

-

-FFmpeg automatically passes @code{-fno-common} to the compiler to work around

-a GCC bug (see @url{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37216}).

-

-Notes:

-

-@itemize

-

-@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

-@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.

-

-@item By using @code{./configure --enable-shared} when configuring FFmpeg,

-you can build the FFmpeg libraries (e.g. libavutil, libavcodec,

-libavformat) as DLLs.

-

-@end itemize

-

-@subsection Microsoft Visual C++ compatibility

-

-As stated in the FAQ, FFmpeg will not compile under MSVC++. However, if you

-want to use the libav* libraries in your own applications, you can still

-compile those applications using MSVC++. But the libav* libraries you link

-to @emph{must} be built with MinGW. However, you will not be able to debug

-inside the libav* libraries, since MSVC++ does not recognize the debug

-symbols generated by GCC.

-We strongly recommend you to move over from MSVC++ to MinGW tools.

-

-This description of how to use the FFmpeg libraries with MSVC++ is based on

-Microsoft Visual C++ 2005 Express Edition. If you have a different version,

-you might have to modify the procedures slightly.

-

-@subsubsection Using static libraries

-

-Assuming you have just built and installed FFmpeg in @file{/usr/local}.

-

-@enumerate

-

-@item Create a new console application ("File / New / Project") and then

-select "Win32 Console Application". On the appropriate page of the

-Application Wizard, uncheck the "Precompiled headers" option.

-

-@item Write the source code for your application, or, for testing, just

-copy the code from an existing sample application into the source file

-that MSVC++ has already created for you. For example, you can copy

-@file{libavformat/output-example.c} from the FFmpeg distribution.

-

-@item Open the "Project / Properties" dialog box. In the "Configuration"

-combo box, select "All Configurations" so that the changes you make will

-affect both debug and release builds. In the tree view on the left hand

-side, select "C/C++ / General", then edit the "Additional Include

-Directories" setting to contain the path where the FFmpeg includes were

-installed (i.e. @file{c:\msys\1.0\local\include}).

-Do not add MinGW's include directory here, or the include files will

-conflict with MSVC's.

-

-@item Still in the "Project / Properties" dialog box, select

-"Linker / General" from the tree view and edit the

-"Additional Library Directories" setting to contain the @file{lib}

-directory where FFmpeg was installed (i.e. @file{c:\msys\1.0\local\lib}),

-the directory where MinGW libs are installed (i.e. @file{c:\mingw\lib}),

-and the directory where MinGW's GCC libs are installed

-(i.e. @file{C:\mingw\lib\gcc\mingw32\4.2.1-sjlj}). Then select

-"Linker / Input" from the tree view, and add the files @file{libavformat.a},

-@file{libavcodec.a}, @file{libavutil.a}, @file{libmingwex.a},

-@file{libgcc.a}, and any other libraries you used (i.e. @file{libz.a})

-to the end of "Additional Dependencies".

-

-@item Now, select "C/C++ / Code Generation" from the tree view. Select

-"Debug" in the "Configuration" combo box. Make sure that "Runtime

-Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in

-the "Configuration" combo box and make sure that "Runtime Library" is

-set to "Multi-threaded DLL".

-

-@item Click "OK" to close the "Project / Properties" dialog box.

-

-@item MSVC++ lacks some C99 header files that are fundamental for FFmpeg.

-Get msinttypes from @url{http://code.google.com/p/msinttypes/downloads/list}

-and install it in MSVC++'s include directory

-(i.e. @file{C:\Program Files\Microsoft Visual Studio 8\VC\include}).

-

-@item MSVC++ also does not understand the @code{inline} keyword used by

-FFmpeg, so you must add this line before @code{#include}ing libav*:

-@example

-#define inline _inline

-@end example

-

-@item Build your application, everything should work.

-

-@end enumerate

-

-@subsubsection Using shared libraries

-

-This is how to create DLL and LIB files that are compatible with MSVC++:

-

-@enumerate

-

-@item Add a call to @file{vcvars32.bat} (which sets up the environment

-variables for the Visual C++ tools) as the first line of @file{msys.bat}.

-The standard location for @file{vcvars32.bat} is

-@file{C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat},

-and the standard location for @file{msys.bat} is @file{C:\msys\1.0\msys.bat}.

-If this corresponds to your setup, add the following line as the first line

-of @file{msys.bat}:

-

-@example

-call "C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat"

-@end example

-

-Alternatively, you may start the @file{Visual Studio 2005 Command Prompt},

-and run @file{c:\msys\1.0\msys.bat} from there.

-

-@item Within the MSYS shell, run @code{lib.exe}. If you get a help message

-from @file{Microsoft (R) Library Manager}, this means your environment

-variables are set up correctly, the @file{Microsoft (R) Library Manager}

-is on the path and will be used by FFmpeg to create

-MSVC++-compatible import libraries.

-

-@item Build FFmpeg with

-

-@example

-./configure --enable-shared

-make

-make install

-@end example

-

-Your install path (@file{/usr/local/} by default) should now have the

-necessary DLL and LIB files under the @file{bin} directory.

-

-Alternatively, build the libraries with a cross compiler, according to

-the instructions below in @ref{Cross compilation for Windows with Linux}.

-

-To use those files with MSVC++, do the same as you would do with

-the static libraries, as described above. But in Step 4,

-you should only need to add the directory where the LIB files are installed

-(i.e. @file{c:\msys\usr\local\bin}). This is not a typo, the LIB files are

-installed in the @file{bin} directory. And instead of adding the static

-libraries (@file{libxxx.a} files) you should add the MSVC import libraries

-(@file{avcodec.lib}, @file{avformat.lib}, and

-@file{avutil.lib}). Note that you should not use the GCC import

-libraries (@file{libxxx.dll.a} files), as these will give you undefined

-reference errors. There should be no need for @file{libmingwex.a},

-@file{libgcc.a}, and @file{wsock32.lib}, nor any other external library

-statically linked into the DLLs.

-

-FFmpeg headers do not declare global data for Windows DLLs through the usual

-dllexport/dllimport interface. Such data will be exported properly while

-building, but to use them in your MSVC++ code you will have to edit the

-appropriate headers and mark the data as dllimport. For example, in

-libavutil/pixdesc.h you should have:

-@example

-extern __declspec(dllimport) const AVPixFmtDescriptor av_pix_fmt_descriptors[];

-@end example

-

-Note that using import libraries created by dlltool requires

-the linker optimization option to be set to

-"References: Keep Unreferenced Data (@code{/OPT:NOREF})", otherwise

-the resulting binaries will fail during runtime. This isn't

-required when using import libraries generated by lib.exe.

-This issue is reported upstream at

-@url{http://sourceware.org/bugzilla/show_bug.cgi?id=12633}.

-

-To create import libraries that work with the @code{/OPT:REF} option

-(which is enabled by default in Release mode), follow these steps:

-

-@enumerate

-

-@item Open @file{Visual Studio 2005 Command Prompt}.

-

-Alternatively, in a normal command line prompt, call @file{vcvars32.bat}

-which sets up the environment variables for the Visual C++ tools

-(the standard location for this file is

-@file{C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat}).

-

-@item Enter the @file{bin} directory where the created LIB and DLL files

-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

-@end example

-

-@end enumerate

-

-@anchor{Cross compilation for Windows with Linux}

-@subsection Cross compilation for Windows with Linux

-

-You must use the MinGW cross compilation tools available at

-@url{http://www.mingw.org/}.

-

-Then configure FFmpeg with the following options:

-@example

-./configure --target-os=mingw32 --cross-prefix=i386-mingw32msvc-

-@end example

-(you can change the cross-prefix according to the prefix chosen for the

-MinGW tools).

-

-Then you can easily test FFmpeg with @uref{http://www.winehq.com/, Wine}.

-

-@subsection Compilation under Cygwin

-

-Please use Cygwin 1.7.x as the obsolete 1.5.x Cygwin versions lack

-llrint() in its C library.

-

-Install your Cygwin with all the "Base" packages, plus the

-following "Devel" ones:

-@example

-binutils, gcc4-core, make, git, mingw-runtime, texi2html

-@end example

-

-And the following "Utils" one:

-@example

-diffutils

-@end example

-

-Then run

-

-@example

-./configure

-@end example

-

-to make a static build.

-

-The current @code{gcc4-core} package is buggy and needs this flag to build

-shared libraries:

-

-@example

-./configure --enable-shared --disable-static --extra-cflags=-fno-reorder-functions

-@end example

-

-If you want to build FFmpeg with additional libraries, download Cygwin

-"Devel" packages for Ogg and Vorbis from any Cygwin packages repository:

-@example

-libogg-devel, libvorbis-devel

-@end example

-

-These library packages are only available from

-@uref{http://sourceware.org/cygwinports/, Cygwin Ports}:

-

-@example

-yasm, libSDL-devel, libdirac-devel, libfaac-devel, libaacplus-devel, libgsm-devel,

-libmp3lame-devel, 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.

-

-@subsection Cross compilation for Windows under Cygwin

-

-With Cygwin you can create Windows binaries that do not need the cygwin1.dll.

-

-Just install your Cygwin as explained before, plus these additional

-"Devel" packages:

-@example

-gcc-mingw-core, mingw-runtime, mingw-zlib

-@end example

-

-and add some special flags to your configure invocation.

-

-For a static build run

-@example

-./configure --target-os=mingw32 --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin

-@end example

-

-and for a build with shared libraries

-@example

-./configure --target-os=mingw32 --enable-shared --disable-static --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin

-@end example

-

 @bye

new file mode 100644

@@ -0,0 +1,344 @@

+\input texinfo @c -*- texinfo -*-

+

+@settitle Using git to develop FFmpeg

+

+@titlepage

+@center @titlefont{Using git to develop FFmpeg}

+@end titlepage

+

+@top

+

+@contents

+

+@chapter Introduction

+

+This document aims in giving some quick references on a set of useful git

+commands. You should always use the extensive and detailed documentation

+provided directly by git:

+

+@example

+git --help

+man git

+@end example

+

+shows you the available subcommands,

+

+@example

+git <command> --help

+man git-<command>

+@end example

+

+shows information about the subcommand <command>.

+

+Additional information could be found on the

+@url{http://gitref.org, Git Reference} website

+

+For more information about the Git project, visit the

+

+@url{http://git-scm.com/, Git website}

+

+Consult these resources whenever you have problems, they are quite exhaustive.

+

+What follows now is a basic introduction to Git and some FFmpeg-specific

+guidelines to ease the contribution to the project

+

+@chapter Basics Usage

+

+@section Get GIT

+

+You can get git from @url{http://git-scm.com/}

+Most distribution and operating system provide a package for it.

+

+

+@section Cloning the source tree

+

+@example

+git clone git://source.ffmpeg.org/ffmpeg <target>

+@end example

+

+This will put the FFmpeg sources into the directory @var{<target>}.

+

+@example

+git clone git@@source.ffmpeg.org:ffmpeg <target>

+@end example

+

+This will put the FFmpeg sources into the directory @var{<target>} and let

+you push back your changes to the remote repository.

+

+

+@section Updating the source tree to the latest revision

+

+@example

+git pull (--rebase)

+@end example

+

+pulls in the latest changes from the tracked branch. The tracked branch

+can be remote. By default the master branch tracks the branch master in

+the remote origin.

+

+@float IMPORTANT

+@command{--rebase} (see below) is recommended.

+@end float

+

+@section Rebasing your local branches

+

+@example

+git pull --rebase

+@end example

+

+fetches the changes from the main repository and replays your local commits

+over it. This is required to keep all your local changes at the top of

+FFmpeg's master tree. The master tree will reject pushes with merge commits.

+

+

+@section Adding/removing files/directories

+

+@example

+git add [-A] <filename/dirname>

+git rm [-r] <filename/dirname>

+@end example

+

+GIT needs to get notified of all changes you make to your working

+directory that makes files appear or disappear.

+Line moves across files are automatically tracked.

+

+

+@section Showing modifications

+

+@example

+git diff <filename(s)>

+@end example

+

+will show all local modifications in your working directory as unified diff.

+

+

+@section Inspecting the changelog

+

+@example

+git log <filename(s)>

+@end example

+

+You may also use the graphical tools like gitview or gitk or the web

+interface available at http://source.ffmpeg.org/

+

+@section Checking source tree status

+

+@example

+git status

+@end example

+

+detects all the changes you made and lists what actions will be taken in case

+of a commit (additions, modifications, deletions, etc.).

+

+

+@section Committing

+

+@example

+git diff --check

+@end example

+

+to double check your changes before committing them to avoid trouble later

+on. All experienced developers do this on each and every commit, no matter

+how small.

+Every one of them has been saved from looking like a fool by this many times.

+It's very easy for stray debug output or cosmetic modifications to slip in,