https://github.com/intel/cartwheel-ffmpeg

Intel developer staging area for unmerged upstream patch contributions to FFmpeg
https://github.com/intel/cartwheel-ffmpeg

Last synced: about 2 months ago
JSON representation

Intel developer staging area for unmerged upstream patch contributions to FFmpeg

• Host: GitHub
• URL: https://github.com/intel/cartwheel-ffmpeg
• Owner: intel
• License: lgpl-2.1
• Created: 2021-01-20T04:51:13.000Z (over 3 years ago)
• Default Branch: master
• Last Pushed: 2024-04-12T10:00:07.000Z (5 months ago)
• Last Synced: 2024-04-14T04:08:26.680Z (5 months ago)
• Homepage:
• Size: 1.39 MB
• Stars: 76
• Watchers: 15
• Forks: 30
• Open Issues: 6
• Metadata Files:
  • Readme: README.cartwheel
  • License: LICENSE

Awesome Lists containing this project

README

        
# cartwheel : ffmpeg

Intel developer staging area for upstream patch contributions to [FFmpeg](https://github.com/ffmpeg/ffmpeg).

The upstream project is tracked as a submodule in this repo.

## upstream process

To improve upstream patch quality and reduce patchset rebase efforts, we use the following process

1. Send PR1 to https://github.com/intel-media-ci/ffmpeg, add module maintainers to Reviewers

1. Got approval from one maintainer

1. Wait for 1 more workday to see any objections. If it's an urgent issue, please ask another reviewer + 1 for you.

1. Close PR1, and send it to the community, ping the community with some frequency if it's no response.

1. If the community has no response in 4 weeks or it’s an urgent issue, send PR2 to https://github.com/intel/cartwheel-ffmpeg

1. Provide upstream patch link, ping maintainers for merging

1. Ping community until the patch merged in upstream

## maintainers

* @xhaihao @feiwan1 @xuguangxin for Linux and OneVPL

* @galinart for Windows

* @guoyejun @Semmer2 for DNN

* @uartie @FocusLuo @Bin-CI for CI system

## clone

```shell

$ git clone https://github.com/intel/cartwheel-ffmpeg --recursive

```

## apply patches

```shell

# 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 

$ git am ../patches/*.patch

```

## build

[how to]( https://github.com/intel/cartwheel-ffmpeg/wiki/How-to-build-cartwheel-ffmpeg)

## rebase

```shell

# at top-level directory

$ git pull --rebase --recurse-submodule

```

## administrators

To update the submodule reference commit id to the latest upstream:

```shell

# 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).

## additional information

For more information and examples about Git Submodules, see https://git-scm.com/book/en/v2/Git-Tools-Submodules