aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-08 12:45:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-08 12:45:24 +0100
commitadc7296aa5b2f1027f55e14b556129b72080f389 (patch)
treefd1d7342ca4baf51cc47322cb879f310e5490fa0
parent3bca69c2a8e70a199d806767624672c4858d091f (diff)
parentb5f9b9ac3681acb06d95530f34660ba9fe225305 (diff)
downloadffmpeg-adc7296aa5b2f1027f55e14b556129b72080f389.tar.gz
Merge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305'
* commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305': doc: Merge disjointed bits about emailing patches Conflicts: doc/developer.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/developer.texi12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/developer.texi b/doc/developer.texi
index 7210207f82..7fa8179cc0 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -358,11 +358,6 @@ The tool is located in the tools directory.
Run the @ref{Regression tests} before submitting a patch in order to verify
it does not cause unexpected problems.
-Patches should be posted as base64 encoded attachments (or any other
-encoding which ensures that the patch will not be trashed during
-transmission) to the ffmpeg-devel mailing list, see
-@url{http://lists.ffmpeg.org/mailman/listinfo/ffmpeg-devel}
-
It also helps quite a bit if you tell us what the patch does (for example
'replaces lrint by lrintf'), and why (for example '*BSD isn't C99 compliant
and has no lrint()')
@@ -370,6 +365,13 @@ and has no lrint()')
Also please if you send several patches, send each patch as a separate mail,
do not attach several unrelated patches to the same mail.
+Patches should be posted to the
+@uref{http://lists.ffmpeg.org/mailman/listinfo/ffmpeg-devel, ffmpeg-devel}
+mailing list. Use @code{git send-email} when possible since it will properly
+send patches without requiring extra care. If you cannot, then send patches
+as base64-encoded attachments, so your patch is not trashed during
+transmission.
+
Your patch will be reviewed on the mailing list. You will likely be asked
to make some changes and are expected to send in an improved version that
incorporates the requests from the review. This process may go through