[FFmpeg-cvslog] [ffmpeg-web] branch master updated. ddec0f7 contact: prefer git format-patch/send-email over git diff.

gitolite ffmpeg-cvslog at ffmpeg.org
Sun Oct 30 01:37:28 CEST 2011


The branch, master has been updated
       via  ddec0f77b01082059c42a14f936cdd6ed2412162 (commit)
       via  19b1a822e67deefc42673f39eaad785519712da9 (commit)
      from  f9dc23a0cd28336f8a7598b55f9e00fde5658b5a (commit)


- Log -----------------------------------------------------------------
commit ddec0f77b01082059c42a14f936cdd6ed2412162
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Sun Oct 30 01:34:45 2011 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Sun Oct 30 01:35:22 2011 +0200

    contact: prefer git format-patch/send-email over git diff.

diff --git a/src/contact b/src/contact
index 2e56ce1..9b5f700 100644
--- a/src/contact
+++ b/src/contact
@@ -17,8 +17,9 @@ corporate disclaimers that claim the content of your mails is confidential.
 Attached patches should not have application/octet-stream as mime-type, but
 text/plain or even better text/x-diff or text/x-patch.
 If you send us a patch, please make it some form of unified diff. We prefer
-patches made using <code>git diff > submission.diff</code> from the root of
-your FFmpeg checkout. For more detailed guidelines, have a look at the
+patches made using <code>git format-patch</code> from the root of your FFmpeg
+checkout or sent with <code>git send-email</code>. For more detailed
+guidelines, have a look at the
 <a href="http://www.mplayerhq.hu/DOCS/tech/patches.txt">MPlayer patch guidelines</a>
 most of what is written there applies to FFmpeg as well.
 Trespass these rules at the risk of being flamed.

commit 19b1a822e67deefc42673f39eaad785519712da9
Author:     Clément Bœsch <ubitux at gmail.com>
AuthorDate: Sun Oct 30 01:25:50 2011 +0200
Commit:     Clément Bœsch <ubitux at gmail.com>
CommitDate: Sun Oct 30 01:35:20 2011 +0200

    index: fix typo in new stuff section.

diff --git a/src/index b/src/index
index c049c51..f9a5dd1 100644
--- a/src/index
+++ b/src/index
@@ -55,7 +55,7 @@ libmodplug & bintext output
 g723.1 encoder
 g723.1 muxer
 random() function for the expression evaluator
-persistemt variables for the expression evaluator
+persistent variables for the expression evaluator
 pulseaudio input support
 h264 422 inter decoding support
 prores encoder

-----------------------------------------------------------------------

Summary of changes:
 src/contact |    5 +++--
 src/index   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 



More information about the ffmpeg-cvslog mailing list