diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 22:27:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 23:31:51 +0200 |
| commit | 35e0496a7bb7243ce3574ab971bd489c7f7a0876 (patch) | |
| tree | 3c6145906ffd6f4342c9b41d17af6ec78b7e94ad /doc | |
| parent | 88a97d660d65b8d5ac2ca719969c0096ace00114 (diff) | |
| parent | 3892e784f2225b32c87a5996347994f108fbd369 (diff) | |
| download | ffmpeg-streaming-35e0496a7bb7243ce3574ab971bd489c7f7a0876.zip ffmpeg-streaming-35e0496a7bb7243ce3574ab971bd489c7f7a0876.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Improve suggested Emacs settings for our coding style.
utvideo: Remove unused variable 'src_size'
mov: free memory on header parsing failure
mov: fix leaking memory with multiple drefs.
swscale: clip before assigning tables in RGB output functions.
swscale: fix off-by-one in second coefficient in bilinear filters.
Conflicts:
libavformat/mov.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer.texi | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 32d666a..0c05e70 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -198,10 +198,16 @@ autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@@<!$/ 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) +(c-add-style "ffmpeg" + '("k&r" + (c-basic-offset . 4) + (indent-tabs-mode nil) + (show-trailing-whitespace t) + (c-offsets-alist + (statement-cont . (c-lineup-assignments +))) + ) + ) +(setq c-default-style "ffmpeg") @end example @section Development Policy |
