intel / cartwheel-ffmpeg

Intel developer staging area for unmerged upstream patch contributions to FFmpeg
GNU Lesser General Public License v2.1
84 stars 31 forks source link

Fixed conflict in 0067 #332

Closed Bin-CI closed 2 weeks ago

Bin-CI commented 2 weeks ago

Update submodule and patchset

Submodule ffmpeg 4e4444f..fcf7296

Fixed conflict in 0067