[MPlayer-cvslog] r19139 - in trunk/libmpeg2: idct.c motion_comp.c

[Diego Biurrun]

On Sat, Jul 29, 2006 at 12:50:46AM -0400, Rich Felker wrote:
> On Fri, Jul 28, 2006 at 10:44:53AM +0200, Diego Biurrun wrote:
> > On Wed, Jul 19, 2006 at 12:43:22PM +0200, Diego Biurrun wrote:
> > > On Wed, Jul 19, 2006 at 07:47:21AM +0200, rfelker wrote:
> > > > 
> > > > Modified:
> > > >    trunk/libmpeg2/idct.c
> > > >    trunk/libmpeg2/motion_comp.c
> > > > 
> > > > Log:
> > > > 10l, i broke this with my last commit. should be fixed now.
> > > 
> > > Please also update the local changes file.
> > 
> > Has replying/reacting gone out of style or did your yearly commit quota
> > run out already? ;-p
> 
> :))
> 
> Is there some sort of script to automate this? Is it documented? I
> don't see an easy way to make the diff against upstream and I was
> hoping some poor loser (like Diego) would just do it for me... ;)

Hehe :)

No, there is no script, it takes a bit of hand-editing patches in this
case.

  svn diff -r 19042:HEAD motion_comp.c idct.c

should be a start, then you have to add the hunks to libmpeg-0.4.0.diff.
Check that

  patch --dry-run -p1 -R -i libmpeg-0.4.0.diff

applies cleanly, that should do the trick.

Diego