Intel developer staging area for upstream patch contributions to FFmpeg.
The upstream project is tracked as a submodule in this repo.
To improve upstream patch quality and reduce patchset rebase efforts, we use the following process
- Send PR1 to https://github.com/intel-media-ci/ffmpeg, add module maintainers to Reviewers
- Got approval from one maintainer
- Wait for 1 more workday to see any objections. If it's an urgent issue, please ask another reviewer + 1 for you.
- Close PR1, and send it to the community, ping the community with some frequency if it's no response.
- If the community has no response in 4 weeks or itβs an urgent issue, send PR2 to https://github.com/intel/cartwheel-ffmpeg
- Provide upstream patch link, ping maintainers for merging
- Ping community until the patch merged in upstream
- @xhaihao @feiwan1 @xuguangxin for Linux and OneVPL
- @galinart for Windows
- @guoyejun @Semmer2 for DNN
- @uartie @FocusLuo @Bin-CI for CI system
$ git clone https://github.com/intel/cartwheel-ffmpeg --recursive
# at top-level directory
$ git submodule update --init --recursive
# at submodule directory
$ cd ffmpeg
# It is recommended to create a branch before applying the patches
$ git checkout -b <my new branch>
$ git am ../patches/*.patch
# at top-level directory
$ git pull --rebase --recurse-submodule
To update the submodule reference commit id to the latest upstream:
# at top-level directory
$ git submodule update --remote --recursive
$ git commit -sam "$(git diff --submodule | head -1 | sed 's/:$//')"
...verify the patches still apply successfully. If they don't apply, fix them and include in new commit(s).
For more information and examples about Git Submodules, see https://git-scm.com/book/en/v2/Git-Tools-Submodules