diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:05:11 +0100 |
| commit | 8ea36711b0a85e24a77e1c76b1cb24aa63df217f (patch) | |
| tree | 5699c8de8c2139e55c188a63a0bcb6f013895c83 /doc | |
| parent | 43dc31f7469c873ccf3927c732a9c2d7d85360bb (diff) | |
| parent | ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff) | |
| download | ffmpeg-8ea36711b0a85e24a77e1c76b1cb24aa63df217f.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer.texi | 2 | ||||
| -rw-r--r-- | doc/faq.texi | 4 | ||||
| -rw-r--r-- | doc/general.texi | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index acffbe67e2..aedc4777bf 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -74,7 +74,7 @@ Indent size is 4. The presentation is one inspired by 'indent -i4 -kr -nut'. The TAB character is forbidden outside of Makefiles as is any form of trailing whitespace. Commits containing either will be -rejected by the Subversion repository. +rejected by the git repository. The main priority in FFmpeg is simplicity and small code size in order to minimize the bug count. diff --git a/doc/faq.texi b/doc/faq.texi index b8a13b79eb..e034bc409f 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -23,7 +23,7 @@ help out creating them. @section I have a problem with an old version of FFmpeg; where should I report it? Nowhere. We do not support old FFmpeg versions in any way, we simply lack the time, motivation and manpower to do so. If you have a problem with an -old version of FFmpeg, upgrade to the latest Subversion snapshot. If you +old version of FFmpeg, upgrade to the latest git snapshot. If you still experience the problem, then you can report it according to the guidelines in @url{http://ffmpeg.org/bugreports.html}. @@ -47,7 +47,7 @@ Likely reasons @item We are busy and haven't had time yet to read your report or investigate the issue. @item You didn't follow @url{http://ffmpeg.org/bugreports.html}. -@item You didn't use Subversion HEAD. +@item You didn't use git HEAD. @item You reported a segmentation fault without gdb output. @item You describe a problem but not how to reproduce it. @item It's unclear if you use ffmpeg as command line tool or use diff --git a/doc/general.texi b/doc/general.texi index 080357a39d..92bcc0d50d 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1032,7 +1032,7 @@ llrint() in its C library. Install your Cygwin with all the "Base" packages, plus the following "Devel" ones: @example -binutils, gcc4-core, make, subversion, mingw-runtime, texi2html +binutils, gcc4-core, make, git, mingw-runtime, texi2html @end example And the following "Utils" one: |