[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Alexander Strasser eclipse7 at gmx.net
Tue Jan 7 22:36:40 CET 2014


On 2014-01-07 19:05 +0100, Clément Bœsch wrote:
> On Tue, Jan 07, 2014 at 06:17:59PM +0100, Michael Niedermayer wrote:
> > On Mon, Jan 06, 2014 at 05:56:31PM +0100, Clément Bœsch wrote:
> > > On Mon, Jan 06, 2014 at 05:49:51PM +0100, Michael Niedermayer wrote:
> > > > ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 17:41:54 2014 +0100| [49a5912440db2925a2d4d0a89ad03f882a6e4ca1] | committer: Michael Niedermayer
> > > > 
> > > > Merge remote-tracking branch 'qatar/master'
> > > > 
> > > > * qatar/master:
> > > >   configure: Update freetype check to follow upstream
> > > > 
> > > > Conflicts:
> > > > 	configure
> > > > 
> > > > Not merged, as its broken (Reported by ubitux)
> > > > 
> > > 
> > > Sorry, it's not actually broken in the way I thought it was. Apologies to
> > > the author(s?).
> > 
> > should it be merged or not ?
> > 
> 
> I have no opinion, see with Alexander (in CC)

  Why should we change it? I wrote the code for FFmpeg a month
ago and it is in wide use already (even long before I backported
to the release branches).

  IMHO do not merge! I will also sent a patch to revert the
print_include hack because we do not need it and it may even
break stuff as explained by Reimar.

  If you have a different opinion, I am sure interested to know
about it. I personally like it if special things are isolated
and clearly marked as such. I do not know any other lib test in
configure that needs the same treatment as libfreetype.

  Alexander
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140107/19e9f51b/attachment.asc>


More information about the ffmpeg-cvslog mailing list