[mythtv] Decision on FFmpeg repository

David Engel david at istwok.net
Fri May 18 19:15:25 UTC 2018


On Fri, May 18, 2018 at 11:38:26AM -0400, Peter Bennett wrote:
> 
> 
> On 05/17/2018 04:01 PM, David Engel wrote:
> > My only current aim for ffmpeg is MediaCodec.  Ater that is done, I
> > wouldn't mind going back to stable, ffmpeg releases.  The git handling
> > with subtrees would probably be more complicated, but I have to
> > believe it can be done.  In theory, it should boil down to a rebase.
> Another option we could consider is using the ffmpeg 4.0 version and
> cherry-pick the commits from ffmpeg master that apply to mediacodec. We
> could do this with a subtree or a private ffmpeg repository and submodule.

That becomes increasingly harder the further the development branch
deviates from the release branch.  Before the 4.0 release was made, I
briefly tried porting the MediaCodec changes to the 3.4.x release.  It
didn't take long before the MediaCodec changes started relying on
other changes that weren't in the relase branch.

> I examined the FFmpeg repository carefully around the 4.0 release and it
> seems they use the same principles we do - the release branch is taken from
> the master branch shortly before release, and all commits in the release
> branch are cherry-picks from the master branch.
> 
> To be able to easily accomplish this I think the best is a private
> repository and a submodule to pull in the correct commit. The submodule
> could be switched to a new branch easily when FFmpeg gets a new version. To
> ensure that everybody gets the correct code when building, the "git
> submodule update" could be in the configure script as suggested by
> Jean-Yves. It will have to allow for building from a tarball, in that case
> it will have to assume everything is up to date.
> 
> I think that trying to switch release branches when using a subtree would be
> excessively complicated.

Has anyone considered consulting with the git maintainers or whomever
is responsible for the subtree support.  Perhaps they have some ideas
on how to do what we need.  Maybe they'd even consider enhancing the
subtree support if what we need can't currently be done.

David
-- 
David Engel
david at istwok.net


More information about the mythtv-dev mailing list