Skip to content

Gstreamer 1.0: merge !28 through !42 into gstreamer_python_upgrade

Related to #56 (closed)

This merges !28 (merged), !32 (merged), !33 (merged), !34 (merged), and !42 (merged) (!41 (closed) reverts !40 (merged), so I merged straight through it)

I merged in each in its own commit until a merge had any significant conflicts (!42 (merged) hit postcoh.c). There's a few autoformatter commits (I forgot to run it on each merge)

I noticed an issue with previous merges, I was merging with the last commit hash in the corresponding MR, rather than the merge MR to O4-dev. I've started merging in the merge MRs instead. The end result should be the same, but I think it upsets the merge conflict detector a little less.

Built and ran here: /fred/oz996/tdavies/spiir_project/sources/testing/gout/py3/MR74_tests

Merge request reports

Loading