Rebased and split into more intelligible commits.
https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m2
(They all should compile since the fixes were merged into the commits
making the changes, but I didn't have time to test all of them.)
On 11/17/21 12:50 PM, Piotr Oniszczuk wrote:
> Sorting current hunks in to commits we can do i.e.:
> 1.generate patch per each current commit
git log --after=2021-11-01 --reverse -p rebase/4.4m2 > out.patch
iconv -c out.patch -o out1.patch
This generates a single file with all of the changes. NB: iconv breaks
my commit fixing non-UTF-8 characters, but makes the file UTF-8 valid.
To skip that commit, and the README.sync ones: git log -n 31 --reverse
-p rebase/4.4m2
> 2.sort & move relevant hunks from p.1 patches into new functional patches (getting 1st functional patch and scan all relevant hunks and put them into patch; compile; test; repeat)
> 3.apply functional patch on upstream ffmpeg4.4 tree
> 4.check: after each functional commit we should 100% the same codebase between current 4.4 downstream & 4.4 upstream with functional patches
> 5.commit p.4 in git if OK
>
> maybe this sounds crazy - but afaik git not allows to selectively move parts of commits between commit1 and commit2 (as commits are atomic).
>
> or i'm wrong here?
git remote add upstream https://github.com/FFmpeg/FFmpeg.git
git rebase -i upstream/release/4.4
Mark a commit for editing, then it can be split into multiple commits.
git reset HEAD^
then git add -p ...
Through several iterations with commit reordering, you can rewrite the
history however you want.
dropped changes:
DVB Subtitles: Fix display of subs with no display segment. ·
MythTV/mythtv@d27bedf
https://github.com/MythTV/mythtv/commit/d27bedf5571bdb80c164ce5d11a8af55f0275b92
Fixed 6 months later in FFmpeg (a decade ago):
Fix dvb subtitle decoding when display segment is missing. ·
FFmpeg/FFmpeg@7df9937
https://github.com/FFmpeg/FFmpeg/commit/7df9937fcc6a91ce4763dfa1ea6fc331f7e77295
FFmpeg does appear to support ATSC subtitles, for example see
libavcodec/atsc_a53.(h|c).
git log -E --grep="[Aa]53"
I have made no further investigation into this at this time.
libavcodec/mpegvideo.h class renaming is probably no longer needed.
https://github.com/ulmus-scott/FFmpeg/commits/rebase/4.4m2
(They all should compile since the fixes were merged into the commits
making the changes, but I didn't have time to test all of them.)
On 11/17/21 12:50 PM, Piotr Oniszczuk wrote:
> Sorting current hunks in to commits we can do i.e.:
> 1.generate patch per each current commit
git log --after=2021-11-01 --reverse -p rebase/4.4m2 > out.patch
iconv -c out.patch -o out1.patch
This generates a single file with all of the changes. NB: iconv breaks
my commit fixing non-UTF-8 characters, but makes the file UTF-8 valid.
To skip that commit, and the README.sync ones: git log -n 31 --reverse
-p rebase/4.4m2
> 2.sort & move relevant hunks from p.1 patches into new functional patches (getting 1st functional patch and scan all relevant hunks and put them into patch; compile; test; repeat)
> 3.apply functional patch on upstream ffmpeg4.4 tree
> 4.check: after each functional commit we should 100% the same codebase between current 4.4 downstream & 4.4 upstream with functional patches
> 5.commit p.4 in git if OK
>
> maybe this sounds crazy - but afaik git not allows to selectively move parts of commits between commit1 and commit2 (as commits are atomic).
>
> or i'm wrong here?
git remote add upstream https://github.com/FFmpeg/FFmpeg.git
git rebase -i upstream/release/4.4
Mark a commit for editing, then it can be split into multiple commits.
git reset HEAD^
then git add -p ...
Through several iterations with commit reordering, you can rewrite the
history however you want.
dropped changes:
DVB Subtitles: Fix display of subs with no display segment. ·
MythTV/mythtv@d27bedf
https://github.com/MythTV/mythtv/commit/d27bedf5571bdb80c164ce5d11a8af55f0275b92
Fixed 6 months later in FFmpeg (a decade ago):
Fix dvb subtitle decoding when display segment is missing. ·
FFmpeg/FFmpeg@7df9937
https://github.com/FFmpeg/FFmpeg/commit/7df9937fcc6a91ce4763dfa1ea6fc331f7e77295
FFmpeg does appear to support ATSC subtitles, for example see
libavcodec/atsc_a53.(h|c).
git log -E --grep="[Aa]53"
I have made no further investigation into this at this time.
libavcodec/mpegvideo.h class renaming is probably no longer needed.