[FFmpeg-devel] [PATCH] updated LGPL AC-3 decoder

Michael Niedermayer michaelni
Sun Jun 3 23:02:05 CEST 2007


On Sun, Jun 03, 2007 at 02:46:20PM -0400, Justin Ruggles wrote:
> Michael Niedermayer wrote:
> > Hi
> > 
> > On Mon, May 07, 2007 at 08:50:00PM -0400, Justin Ruggles wrote:
> > 
> >>Michael Niedermayer wrote:
> >>
> >>[...]
> >>>and patch looks ok
> >>
> >>great.  now...
> >>
> >>Should I apply it all at once or try to go back to the original SoC code
> >>and do incremental changes?  I looked back at the original, and my best
> >>guess is that I changed about 75% of the code.  I could do it either way
> >>really.
> > 
> > 
> > incremental is better if its easy, but if you use some script to
> > automatically check all the revissions in then test it on a dummy
> > repository first and ensure it can deal with errors
> > the precommit check script might reject changes due to whitespace/tab issues
> > or there might be a conflicting commit in the middle (extreemly unlikely i 
> > know, but the script should stop if something unexpected happens ...)
> I don't think I have the scriping skills to create such a thing.  I also
> don't really have a repo to test with.  I noticed others are working on
> last year's AAC decoder.  Are there plans to merge that into FFmpeg with
> history?  If so, is there already a script out there to do this?
> If others are willing to help with getting the AC-3 decoder from the SoC
> branch to FFmpeg while preserving the history, I am willing to apply
> incremental changes to the SoC code to bring it inline with the current
> patch.  Otherwise, I think I should just apply it as-is so I don't screw
> anything up.

with git its a matter of

in SOC repo
git log --reverse --pretty=email -p <all relevant ac3 files/paths> >mypatch

in ffmpeg
git am mypatch

you might also have to do something if the pathes missmatch, and i guess
there are various other ways to achive the same with git (and yes iam
interrested to hear about these, iam a git newbee after all ...)

either way, after the above you would check if your local repo contains
all the revissions, and if dates/authors look approximately ok and
nothing unexpected happened and then just push it to mphq, well that
is if ffmpeg were finally converted to git

mans? whats the status of that, can we delay the merge until you
finish what you begun?
if no then ill leave it to root at mphq to write a script to workaround
the braindeadness of svn, or maybe someone (oded?) already has a script
to do that with svn ...

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: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070603/a96a64f7/attachment.pgp>

More information about the ffmpeg-devel mailing list