diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
| commit | 8e2bab5d4bddb4029503c0f90623854948ddb3c5 (patch) | |
| tree | 33a095ce0e92ed353c96c9b25b746ee45a2a00c7 /doc/developer.texi | |
| parent | 7023fb81c78e10a6a7af6e6bc8902f99da81c458 (diff) | |
| parent | 78212cefe14a2086dc1ea3778b76623b949e5d0c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
drawtext: remove typo
pcm-mpeg: implement new audio decoding api
w32thread: port fixes to pthread_cond_broadcast() from x264.
doc: add editor configuration section with Vim and Emacs settings
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
avformat/utils: Drop unused goto label.
doxygen: Replace '\' by '@' in Doxygen markup tags.
cosmetics: drop some completely pointless parentheses
cljr: simplify CLJRContext
drawtext: introduce rand(min, max)
drawtext: introduce explicit draw/hide variable
rtmp: Use nb_invokes for all invoke commands
Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/developer.texi')
| -rw-r--r-- | doc/developer.texi | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 75895d9147..59da187208 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -179,6 +179,31 @@ Casts should be used only when necessary. Unneeded parentheses should also be avoided if they don't make the code easier to understand. @end itemize +@subsection Editor configuration +In order to configure Vim to follow Libav formatting conventions, paste +the following snippet into your @file{.vimrc}: +@example +" indentation rules for libav: 4 spaces, no tabs +set expandtab +set shiftwidth=4 +set softtabstop=4 +" allow tabs in Makefiles +autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8 +" Trailing whitespace and tabs are forbidden, so highlight them. +highlight ForbiddenWhitespace ctermbg=red guibg=red +match ForbiddenWhitespace /\s\+$\|\t/ +" Do not highlight spaces at the end of line while typing on that line. +autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@@<!$/ +@end example + +For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: +@example +(setq c-default-style "k&r") +(setq-default c-basic-offset 4) +(setq-default indent-tabs-mode nil) +(setq-default show-trailing-whitespace t) +@end example + @section Development Policy @enumerate |