[ffmpeg/f31: 2/2] Merge branch 'f32' into f31
commit 0df5a1dce21b2161f67b0c5ce6a2207ce241ca52
Merge: bef145b d74b9e3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 9 21:19:46 2020 +0100
Merge branch 'f32' into f31
ffmpeg.spec | 12 +++++++++---
sources | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
---