[ffmpeg/f31: 3/3] Merge branch 'f32' into f31
commit a5968fc0b422b64205ee06ded31234ac9709aea6
Merge: 101a4e8 8538a7e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 23 13:00:42 2020 +0100
Merge branch 'f32' into f31
ffmpeg.spec | 11 +++++++----
fix-vmaf-model-path.patch | 25 +++++++++++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
---