[mythtv] FFmpeg plans

[Peter Bennett]

On 05/11/2018 05:13 PM, David Engel wrote:
> I have one idea, but it's not without its own share of warts.  That is
> to treat the ffmpeg-master branch (and possibly others) like tracking
> branches.  It could go something like this.
>
> # Remove the existing external/FFmpeg from the mythtv repo.
> git rm -r external/FFmpeg
>
> # Create an empty ffmpeg-master branch in the mythtv repo.
> git co ce7a5f62 (the epoch commit with an empty repo>
> git branch ffmpeg-master
> git co ffmpeg-master
>
> # Pull in ffmpeg master branch and move it to the right place.
> git pull --allow-unrelated-historieshttps://github.com/FFmpeg/FFmpeg.git  master
> mkdir external/FFmpeg
> git mv <list of files> external/FFmpeg
>
> # Merge the ffmpeg-master branch into mythtv master.
> git co master
> git merge ffmpeg-master
>
> One wart is that anytime ffmpeg adds new files in their root, we would
> have to notice them when we pull and git mv them to external/FFmpeg.
>
> Another wart is we would have to do the same with any other ffmpeg
> branches that we might want to cherry-pick from.
I originally thought of this option before I found subtree. It is still 
rather complicated. I don't know how it would handle files that are 
moved from one ffmpeg directory to another (that was the case with a 
bunch of files between 3.2 and 3.4).

Peter