[ffmpeg/f30: 5/5] Merge branch 'master' into f30
commit 37b51db23e5c45603f14ec41e0ee9dbe2831afce
Merge: 13b691b 447488b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Jul 9 07:27:04 2019 +0100
Merge branch 'master' into f30
ffmpeg.spec | 17 ++++++++++++++---
sources | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
---