[mythtv] FFmpeg plans

[Paul Harrison]

On 30/04/18 09:15, Stuart Auchterlonie wrote:

> On 28/04/18 23:58, Peter Bennett wrote:
>>
>>
>> On 04/28/2018 06:07 PM, Jean-Yves Avenard wrote:
>>> *From:* Peter Bennett
>>> *Sent:* Saturday, 28 April 2018 23:35
>>> *To:* mythtv-dev at mythtv.org
>>> *Subject:* Re: [mythtv] FFmpeg plans
>>>
>>>
>>>
>>> On 04/28/2018 05:16 PM, Jean-Yves Avenard wrote:
>>>> What about the mpeg-ts demuxer?
>>>>
>>> That is part of step 3. (Apply our FFmpeg customizations and commit 
>>> them). It includes adding files that were added to our copy of 
>>> FFmpeg. This is really the FFmpeg merge as I did before (without the 
>>> configure merge) but hopefully now for the last time because going 
>>> forward we can just pull from FFmpeg.
>>>
>>> Do you see a problem with this?
>>>
>>> Peter
>>>
>>> No problem at all, just from experience every resync required manual 
>>> tweaks there. Don't see how that could be automated.
>> I plan to try it out by bringing in a commit of FFmpeg from a month 
>> or two ago and do the tweaks. Then try a pull of later commit from 
>> FFmpeg to see how well it works. There could be conflicts, as there 
>> could with any pull, that have to be fixed.
>>
>
> Can you apply your own patches to an external tree in git?
> That would be a requirement for this to work surely?
>
>
> Regards
> Stuart
>

I think that could be a problem since you need write access to the 
upstream project to commit them. What I do is fork the external project 
and then add my own fork as the submodule. It's easy to keep the fork in 
sync and you only have to do it when it's convenient. You don't want to 
pull a big update from upstream just before you do a release for example.

I'm in no way a git expert so there may well be more elegant ways of 
doing it and  usually when git is involved I suspect if you ask six 
developers the best way to do it they will tell you six different answers :)

Paul H.