[ffmpeg/f34: 3/3] Merge branch 'master' into f34
commit fb4a456ba82449c31c18ebd95d8bbffb5ae9afe4
Merge: 85374f4 02ac0d8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Mar 23 20:36:12 2021 +0000
Merge branch 'master' into f34
.gitignore | 1 +
ffmpeg-snapshot.sh | 3 ++-
ffmpeg.spec | 10 +++++++---
sources | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
---