[FFmpeg-devel] libavfilter: single ffplay.c diff?

Stefano Sabatini stefano.sabatini-lala
Tue Sep 30 00:42:14 CEST 2008


On date Friday 2008-09-26 10:02:12 +0200, Benoit Fouet encoded:
> Hi,
> 
> Stefano Sabatini wrote:
> > On date Thursday 2008-09-25 22:42:15 +0200, Stefano Sabatini encoded:
> >   
> >> What about to provide in libavfilter just a single patch for ffplay.c
> >> rather than:
> >> 01_ffplay_get_video_frame.diff    03_ffplay_filters.diff
> >> 02_ffplay_VideoPicture_vars.diff
> >>
> >> This should ease development (for example if I change X I have to
> >> "revert" up to the relevant diffed version N, then I have to make the
> >> diff against N-1, and finally change the following diffs). While I'm
> >> sure there are better ways to achieve that (e.g. to use quilt/git) in
> >> practice it makes more difficult to provide patches to
> >> libavfilter-soc.
> >>
> >> So I suggest to use just a patch for ffplay.c as the one provided for
> >> ffmpeg.c, then I think we should update both patches to a recent
> >> version of FFmpeg (I volunteer for it).
> >>     
> >
> > In order to simplify testing and development I also propose to use a
> > checkout.sh script like in others soc projects, check the patch below.
> >
> > Regards.
> > --
> > FFmpeg = Fiendish Foolish Multimedia Patchable Extravagant Guru
> >   
> > ------------------------------------------------------------------------
> >
> > Index: checkout.sh
> > ===================================================================
> > --- checkout.sh	(revision 0)
> > +++ checkout.sh	(revision 0)
> > @@ -0,0 +1,15 @@
> > +#! /bin/sh
> > +
> > +ffmpeg_rev=15000
> > +
> > +echo "checking out pristine ffmpeg $ffmpeg_rev"
> > +svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r $ffmpeg_rev
> > +
> > +echo "patching ffmpeg $ffmpeg_rev"
> > +(cd ffmpeg;
> > +for diff in $(find ../diffs -name '*.diff'); do
> > +   patch -p0 < $diff
> > +done)
> >   
> 
> maybe simpler:
> find `pwd`/diffs/ -name *.diff -exec patch -d ffmpeg -p0 -i {} \;

well it was wrong, I had also to sort the patches, and I don't know
how to do it cleanly in one step.

> > +echo "moving files to libavfilter"
> > +find -maxdepth 1 -type f -regex '^\./[^\.].*' -not -name $(basename $0) -exec cp '{}' ffmpeg/libavfilter ';'
> >
> >   
> 
> I don't see the use of the regex part...

Yes, indeed it was unnecessary.

> (BTW why didn't you send that patch to FFmpeg-soc ML ?)

FFmpeg-soc seems to be used only for logs and comments to that,
furthermore I already asked this question here and Michael replied
this was the right list.

BTW, the checkout.sh doesn't work with latest SVN, so I'm going to
apply it only after I'll have updated the ffplay patch.

Regards.
-- 
FFmpeg = Funny Fantastic Mean Purposeless ExchanGer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: checkout.sh
Type: application/x-sh
Size: 358 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080930/1a19c2c7/attachment.sh>



More information about the ffmpeg-devel mailing list