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/developer.texi | |
| 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/developer.texi')
| -rw-r--r-- | doc/developer.texi | 2 |
1 files changed, 1 insertions, 1 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. |