[FFmpeg-devel] [PATCH] share xiph rtp code

Ronald S. Bultje rsbultje
Mon Mar 29 04:22:40 CEST 2010


Hi Josh,

On Sun, Mar 28, 2010 at 1:12 PM, Josh Allmann <joshua.allmann at gmail.com> wrote:
> On 28 March 2010 08:27, Martin Storsj? <martin at martin.st> wrote:
>> On Sun, 28 Mar 2010, Josh Allmann wrote:
>>> 002: renaming and other cosmetic changes to rtpdec_xiph
>>
>> You do some cosmetic changes here (e.g. indenting) - such things are
>> preferred to be done in several steps, i.e., first just the actual
>> changes, then reindent as a purely cosmetic commit. Good for you that git
>> can do that (almost) for you - if you make the patches with -w, it will
>> skip lines with only whitespace modifications.
>
> Split into two patches, for renaming and cosmetics (whitespace).
> The rest is otherwise unchanged.

The renaming patch has some shared stuff in it already. Here's how we
generally do it (I know I'm pissing you off here, sorry, it's just
that it's easier to review that way):

- start with the original code
- svn cp rtpdec_{theora,xiph}.c
- svn cp rtpdec_{theora,xiph}.h
- your first patch is to change Makefile, rtpdec_xiph.[ch] (e.g.
change "#include "rtpdec_theora.h"" into "#include "rtpdec_xiph.h"")
so it compiles again (note how this way, the whole svn history is
maintained for rtpdec_theora.[ch])
- third patch, merge the vorbis stuff (should be minimal), and
possible also rename some functions s/theora/xiph/ where relevant,
change comments, etc.

The changes would each be only a few kB (instead of your first patch,
which is ~26kB for the complete file copy, with some modifications
here and there which are impossible to track), and would maintain file
history between rtpdec_theora/xiph.[ch].

Ronald



More information about the ffmpeg-devel mailing list