update submodule and 0129 conflict rebase

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

Closed uartie closed 2 months ago

uartie commented 2 months ago

Submodule ffmpeg 20206e14d748..9d675bb60d25

...and fix 0129 rebase conflict

cc @tong1wu

tong1wu commented 2 months ago

LGTM, thx.

xhaihao commented 2 months ago

LGTM, the errors in pre-check shouldn't be caused by this PR.