[ffmpeg/f31: 2/2] Merge branch 'f32' into f31
commit 8619d38eeac1c71b60c6412b3f4f93225cfe8fda
Merge: 8cf0805 7d4c249
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 12:23:17 2020 +0100
Merge branch 'f32' into f31
ffmpeg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---