diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:56:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:56:41 +0100 |
| commit | 249fca3df9f9790369d38aaa63c828c3e2a30936 (patch) | |
| tree | fe8f3784cc3160505617bf76b32534c4b5367658 /doc | |
| parent | 3a0bac27b3c851924a5fbde5301a3ad6bf951aba (diff) | |
| parent | 074a00d192c0e749d677b008b337da42597e780f (diff) | |
| download | ffmpeg-249fca3df9f9790369d38aaa63c828c3e2a30936.tar.gz | |
Merge commit '074a00d192c0e749d677b008b337da42597e780f'
* commit '074a00d192c0e749d677b008b337da42597e780f':
lavr: add a public function for setting a custom channel map
lavr: typedef internal structs in internal.h
doc: Extend commit message section
Conflicts:
doc/APIchanges
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | doc/developer.texi | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a79dd2df58..fc5c3f2cb7 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -132,6 +132,10 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2013-xx-xx - xxxxxxx - lavr 1.1.0 + Add avresample_set_channel_mapping() for input channel reordering, + duplication, and silencing. + 2012-xx-xx - xxxxxxx - lavu 52.2.1 - avstring.h Add av_basename() and av_dirname(). diff --git a/doc/developer.texi b/doc/developer.texi index fce842a006..7e4b12c528 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -229,6 +229,13 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: (#ifdef etc) by default so it does not interfere with other developers' work. @item + The commit message should have a short first line in the form of + a @samp{topic: short description} as a header, separated by a newline + from the body consisting of an explanation of why the change is necessary. + If the commit fixes a known bug on the bug tracker, the commit message + should include its bug ID. Referring to the issue on the bug tracker does + not exempt you from writing an excerpt of the bug in the commit message. +@item You do not have to over-test things. If it works for you, and you think it should work for others, then commit. If your code has problems (portability, triggers compiler bugs, unusual environment etc) they will be |