summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLou Logan <lou@lrcd.com>2018-04-05 10:10:37 -0800
committerLou Logan <lou@lrcd.com>2018-04-06 13:24:18 -0800
commit2f1963eedc0c59413a03bffd45492741020a1666 (patch)
tree57876e2031e121ee3841dedf2b97f0d174df0496
parente54679b6c1def5a969d4a5c9db63b51efe7106d7 (diff)
downloadffmpeg-streaming-2f1963eedc0c59413a03bffd45492741020a1666.zip
ffmpeg-streaming-2f1963eedc0c59413a03bffd45492741020a1666.tar.gz
doc/developer: remove merge request method of contributing
This seems to confuse Github users into thinking that we may accept pull requests. We do not accept pull requests. Sending patches to the ffmpeg-devel mailing list is our preferred method for users to contribute code. Signed-off-by: Lou Logan <lou@lrcd.com>
-rw-r--r--doc/developer.texi6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/developer.texi b/doc/developer.texi
index 0fc9c3f..a0eeefe 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -30,13 +30,11 @@ consult @url{https://ffmpeg.org/legal.html}.
@chapter Contributing
-There are 3 ways by which code gets into FFmpeg.
+There are 2 ways by which code gets into FFmpeg:
@itemize @bullet
-@item Submitting patches to the main developer mailing list.
+@item Submitting patches to the ffmpeg-devel mailing list.
See @ref{Submitting patches} for details.
@item Directly committing changes to the main tree.
-@item Committing changes to a git clone, for example on github.com or
- gitorious.org. And asking us to merge these changes.
@end itemize
Whichever way, changes should be reviewed by the maintainer of the code
OpenPOWER on IntegriCloud