<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">On 11/24/21 8:39 PM, Peter Bennett
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:0b9f6820-28bb-64cd-5584-234a28070c5b@gmail.com">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<p>Thank you. Great work. I plan to combine the list of commits
that Scott Theisen created, plus the pull request that he
created for eliminating unnecessary code that is no longer used,
plus this, and use a new methodology as suggested by Piotr, to
take the FFmpeg code and apply our patches on it, rather than
merging the FFmpeg version with our code.</p>
</blockquote>
I rebased <a class="moz-txt-link-freetext" href="https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m2">https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m2</a>
to remove the various reversion commits I added. See
<a class="moz-txt-link-freetext" href="https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m3">https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m3</a> , not
(yet) tested to compile at each commit.<br>
<br>
My pull request, <a class="moz-txt-link-freetext" href="https://github.com/MythTV/mythtv/pull/416">https://github.com/MythTV/mythtv/pull/416</a> , mostly
does not touch the FFmpeg copy in the mythtv repository.<br>
<blockquote type="cite"
cite="mid:0b9f6820-28bb-64cd-5584-234a28070c5b@gmail.com">
<p>The list of our patches can be stored somewhere and updated as
necessary so that it can be applied to each new FFmpeg version.
Alternatively, once the patches have been applied to a version,
they can be extracted again using git format-patch and applied
to the next version with git am. This could also pick up any new
patches that were subsequently applied to our FFmpeg code,
although hopefully these could be kept to a minimum.<br>
</p>
<p>Peter<br>
</p>
</blockquote>
It should be easier to rebase from one release branch to another,
since I have split the changes and eliminated others.<br>
<br>
The subtitle changes need to be investigated to determine if they
are still necessary. What the mpegts changes <b>are</b> also needs
to be determined. Additionally, the use of internal ffmpeg headers
in MythTV needs to be replaced.<br>
<br>
Peter: you deleted README.sync. Was that intentional? If so, you
can probably drop the commits editing it.<br>
<br>
<br>
Scott<br>
</body>
</html>