[FFmpeg-cvslog] r25385 - trunk/libavformat/mpegenc.c
Michael Niedermayer
michaelni
Fri Oct 8 17:28:09 CEST 2010
On Fri, Oct 08, 2010 at 11:08:03AM +0200, Diego Biurrun wrote:
> On Thu, Oct 07, 2010 at 08:33:19PM +0200, Michael Niedermayer wrote:
> > On Thu, Oct 07, 2010 at 02:17:10PM +0200, Diego Biurrun wrote:
> > > On Thu, Oct 07, 2010 at 12:24:15PM +0200, Michael Niedermayer wrote:
> > > > On Wed, Oct 06, 2010 at 08:16:20PM -0700, Alex Converse wrote:
> > > > > On Wed, Oct 6, 2010 at 6:57 PM, michael <subversion at mplayerhq.hu> wrote:
> > > > > >
> > > > > > Log:
> > > > > > Warn if muxing mpeg ps is attempted without a VBV buffer size.
> > > > > >
> > > > > > --- trunk/libavformat/mpegenc.c Thu Oct ?7 03:57:35 2010 ? ? ? ?(r25384)
> > > > > > +++ trunk/libavformat/mpegenc.c Thu Oct ?7 03:57:39 2010 ? ? ? ?(r25385)
> > > > > > @@ -367,8 +367,10 @@ static int mpeg_mux_init(AVFormatContext
> > > > > > ? ? ? ? ? ? if (st->codec->rc_buffer_size)
> > > > > > ? ? ? ? ? ? ? ? stream->max_buffer_size = 6*1024 + st->codec->rc_buffer_size/8;
> > > > > > - ? ? ? ? ? ?else
> > > > > > + ? ? ? ? ? ?else{
> > > > >
> > > > > Just two days ago people asked you to put whitespace after keywords.
> > > >
> > > > yes and iam not doing it, you should vote on me being leader accordingly.
> > >
> > > The attitude you show when criticized...
> > >
> > > > also IMHO, the one who said it loud enough for me to remember it at all is
> > > > diego (on the phone ;) ) and he
> > > > neither maintains C code nor is he contributing C code. And this is stuff
> > > > that should be decided by the people falling in these 2 categories
> > >
> > > Except of course for Stefano two days ago. And who would dare to
> > > criticize you when you immediately threaten to kill the critic or
> > > yourself?
> >
> > killing myself is my choice ;)
> > and i didnt threten to kill any critic
>
> Correct. You skip the threats and proceed to kill them.
do you have an example?
>
> > > I'll also have to note that K&R style is mandated in the developer
> > > guidelines. But those guidelines are just something you use to
> > > smack people over the head, not something you feel bound by
> > > yourself.
> >
> > Ill quote the policy for you, and id like to politely but sternly point out
> > that people should _read_ the policy before accusing others about breaking it.
> >
> >
> > We refuse source indentation and other cosmetic changes if they are mixed
> > with functional changes, such commits will be rejected and removed. Every
> > ^^^^
> > developer has his own indentation style, you should not change it. Of course
> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> > if you (re)write something, you can use your own style, even though we would
> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> > prefer if the indentation throughout FFmpeg was consistent (Many projects
> > force a given indentation style - we do not.). If you really need to make
> > indentation changes (try to avoid this), separate them strictly from real
> > changes.
> >
> > Its you breaking this continously not me. You want things to be different
> > and you always wanted things to be different but preaching everywhere that
> > things are different doesnt make them so.
>
> This paragraph was added by you without consultation and you break the
This paragraph was added in the initial commit of the whole policy. It still
said CVS back then. Its too long ago for me to remember what discussions
preceeded it but i doubt it was commited without asking other developers.
Also iam pretty sure it matched mplayers policy at that time. And so this
was widely accepted and not just my idea.
The strict K&R style is a recent trend that was started by uoti in mplayer
before he was thrown out
> formatting of files that already use a consistent indentation style
> without second thought.
>
> > And the other part (not part of the policy) about style says that:
> > Indent size is 4.
> > The presentation is one inspired by 'indent -i4 -kr -nut'.
> > The TAB character is forbidden outside of Makefiles as is any
> > form of trailing whitespace. Commits containing either will be
> > rejected by the Subversion repository.
> >
> > This says 'INSPIRED by 'indent -i4 -kr -nut'' it does not say follow the
> > indent output to the last whitespace is mandatory
>
> The "inspired" is a change unilaterally approved by yourself.
It was a patch by ben posted to ffmpeg-dev that added "inspired", and noone
expressed any dislike for this change until now, the mail from ben is below as
reference.
From: Benjamin Larsson <banan at ludd.ltu.se>
To: FFmpeg development discussions and patches <ffmpeg-devel at mplayerhq.hu>
Subject: [FFmpeg-devel] [PATCH] developer documentation change
Small change to reflect the reality.
MvH
Benjamin Larsson
developer.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
45480886f66ba1574bb6d963bbb5e2faa7040b24 doc_change.diff
Index: developer.texi
===================================================================
--- developer.texi (revision 19795)
+++ developer.texi (working copy)
@@ -70,7 +70,7 @@
@end itemize
Indent size is 4.
-The presentation is the one specified by 'indent -i4 -kr -nut'.
+The presentation is one inspired by 'indent -i4 -kr -nut'.
The TAB character is forbidden outside of Makefiles as is any
form of trailing whitespace. Commits containing either will be
rejected by the Subversion repository.
------------------------
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
There will always be a question for which you do not know the correct awnser.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20101008/27234056/attachment.pgp>
More information about the ffmpeg-cvslog
mailing list