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 #314

Closed wenbinc-Bin closed 2 months ago

wenbinc-Bin commented 2 months ago

patch merged into upstream: 0534d2a delete patch 0134 update patch 0116 0118 update ffmpeg: 7e59c4f to 2a7d622