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: #329

Closed wenbinc-Bin closed 3 weeks ago

wenbinc-Bin commented 3 weeks ago

remove patch: 0074 update patches: 0075 0116 0118 0129 update ffmpeg: f68f407~a0ff31e

xhaihao commented 3 weeks ago

LGTM