[FFmpeg-devel] [PATCH] ffmpeg: reduce differences with avconv for in/out scheduling.

Michael Niedermayer michaelni at gmx.at
Sun Aug 19 14:29:28 CEST 2012

On Sun, Aug 19, 2012 at 11:28:48AM +0200, Nicolas George wrote:
> Le tridi 3 fructidor, an CCXX, Michael Niedermayer a écrit :
> > It may be interresting to note that this does not reduce the diff to
> > avconv
> > 
> >  qatar/master:avconv.c => HEAD^:ffmpeg.c | 1576 ++++++++++++++++++++++---------
> >  1 file changed, 1138 insertions(+), 438 deletions(-)
> >  qatar/master:avconv.c => HEAD:ffmpeg.c | 1591 +++++++++++++++++++++++---------
> >  1 file changed, 1148 insertions(+), 443 deletions(-)
> That is true, although some of the insertions are doxy. Adding back their
> non-working code between "#if 0" may help you match hunks affecting it,
> maybe?

i dont think adding non working code between #if 0 is a good idea.
bugfixes or features merged into it wont help us for example as they
would end in dead code.

I think we should aim toward correct, fast and understandable code
first and keeping the diff to avconv small second. If the diff is
small then both sides have less work merging changes from the other.


Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120819/bdd1674e/attachment.asc>

More information about the ffmpeg-devel mailing list