Update ffmpeg and resolve conflict

intel / cartwheel-ffmpeg

Intel developer staging area for unmerged upstream patch contributions to FFmpeg

GNU Lesser General Public License v2.1

93 stars 33 forks source link

Closed wenbinc-Bin closed 1 year ago

wenbinc-Bin commented 1 year ago

ffmpeg-dnn is changed on upstream. update and resolve conflict in cartwheel.