<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">On 2/7/22 12:02, Peter Bennett wrote:<br>
</div>
<blockquote type="cite"
cite="mid:3a07e4b2-8177-76f1-aede-268c6c407736@gmail.com">You have
a pull request in MythTV/mythtv for ffmpeg cleanup, and also one
in mythTV/FFmpeg for reversions.
<br>
<br>
I would also like to start merging the latest FFmpeg master in
preparation for FFmpeg 5.0. My process is to merge from
FFmpeg/FFmpeg master into MythTV/FFmpeg master up to the point
where FFmpeg creates release/5.0, then create release/5.0 in
MythTV/FFmpeg. Once everything is successfully merged, then copy
the FFmpeg contents into MythTV, ffmpeg-resync branch.
ffmpeg-resync branch will be deleted and recreated from master.
<br>
<br>
In order to make bisecting FFmpeg changes easier I would like to
try multiple cherry-pick or rebase instead of merge into our
FFmpeg so that there is a single line history of commits.
<br>
<br>
This process necessarily loses all changes that have been
committed to MythTV/mythtv/external/FFmpeg.
<br>
<br>
The ffmpeg cleanup pull request contains changes to
MythTV/mythtv/external/FFmpeg which will be lost. Are all of those
changes contained in the reversions pull request?
<br>
</blockquote>
<br>
All the changes to external/FFmpeg in
<a class="moz-txt-link-freetext" href="https://github.com/MythTV/mythtv/pull/416">https://github.com/MythTV/mythtv/pull/416</a> are also in
<a class="moz-txt-link-freetext" href="https://github.com/MythTV/FFmpeg/pull/1">https://github.com/MythTV/FFmpeg/pull/1</a> the reversions PR.<br>
<br>
git diff reversions rebase/4.4m3<br>
The only differences are from the extra two upstream commits that I
branched after.<br>
<br>
<blockquote type="cite"
cite="mid:3a07e4b2-8177-76f1-aede-268c6c407736@gmail.com">
<br>
Do you recommend applying your pull requests before starting the
merge, rebase or cherry-pick of FFmpeg master into our FFmpeg?
<br>
</blockquote>
<br>
The FFmpeg PR is equivalent to rebase/4.4m3 so I would recommend
applying the MythTV PR first, so I can then rebase and squash those
commits back onto release/4.4.<br>
<br>
Then I'll rebase onto FFmpeg's release/5.0.<br>
<br>
I am also working on harmonizing mpegts-mythtv.(h|c) with
mpegts.(h|c). See
<a class="moz-txt-link-freetext" href="https://github.com/ulmus-scott/FFmpeg/commits/harmonize">https://github.com/ulmus-scott/FFmpeg/commits/harmonize</a> .<br>
<br>
git diff --no-index --color-moved libavformat/mpegts.c
libavformat/mpegts-mythtv.c<br>
<br>
I decided since most of the functions using the old packet API were
unmodified by MythTV, it would be easier to just copy the versions
from FFmpeg 4.4. Unfortunately, most of the MythTV modifications
are buried under 17 years of updates.<br>
<br>
Regards,<br>
Scott<br>
<style type="text/css">p { line-height: 115%; margin-bottom: 0.1in; background: transparent }a:visited { color: #800000; so-language: zxx; text-decoration: underline }a:link { color: #000080; so-language: zxx; text-decoration: underline }</style><br>
<br>
</body>
</html>