search

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

Fix conflict #326

Closed wenbinc-Bin closed 1 month ago

wenbinc-Bin commented 1 month ago

ffmpeg submodule: fa3b153..544acfa

update patch: 0074 0075 0116 0117 0118

xhaihao commented 1 month ago

The error in pre-check shouldn't be caused by this PR.