[mythtv] Merged FFmpeg 4.4.1 into master

Scott Theisen scott.the.elm at gmail.com
Sat Dec 4 21:44:56 UTC 2021


On 12/3/21 09:06, Peter Bennett wrote:
> I have merged FFmpeg 4.4.1 into master from devel/ffmpeg-resync-0.
>
> Also I rebased devel/ffmpeg-resync to master, although at this point 
> that is going nowhere.

I'll rebase my pull request and add the reversion commits to make the 
testing of those easier.

If the reversions are acceptable, then the history can be "rewritten" 
after merging the pull request by:

 1. deleting the copy of ffmpeg
 2. adding it back unmodified
 3. applying the commits from
    https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m3

That should separate and make obvious the MythTV changes from FFmpeg.

Scott
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mythtv.org/pipermail/mythtv-dev/attachments/20211204/93e0fc81/attachment.htm>


More information about the mythtv-dev mailing list