[ffmpeg/f31] (2 commits) ...Merge remote-tracking branch 'origin/f32' into f31
Summary of changes:
9cd3ee8... Enable libmodplug (*)
814764a... Merge remote-tracking branch 'origin/f32' into f31
(*) This commit already existed in another branch; no separate mail sent