[vlc-devel] commit: contribs: disable libfaac on Darwin (as part of ffmpeg) as it considered nonfree now ( Felix Paul Kühne )

[Rémi Duraffort]

Hej,
>> Maybe we should stop merging things, but just backporting from master
>> again...
>
> which is definitely a *GOOD* idea as I will *HAVE TO* do changes to  
> 1.0-bugfix which may not end-up in master as they will break it and  
> remove in-complete features which need to be withdrawn from bugfix  
> before RC2. Additionally, I have the suspicion that a merge with 1.0- 
> bugfix led to the complete vout breakage in master on OS X. Since RC2  
> will be tagged, I'll withdraw these features this evening, which is why I 
> ask you to stop merging these branches.
>
> Cherry-picking shouldn't be a big deal for any of us.

I agread with this (evenmore because we now have some duplicated
commits). I can also do the backport if the commiters don't have time
for it (just ask for it and I will do the backport)


Best regards

-- 
Rémi Duraffort | ivoire