[vlc/f31: 10/10] Merge branch 'master' into f31
commit 4569389949b9b21cdad2e6655d548d34499fb661
Merge: c857534 b83425f
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Sat Jan 18 10:34:57 2020 +0100
Merge branch 'master' into f31
libplacebo_patch_1.patch | 27 +-
mmal_10.patch => mmal_16.patch | 6834 +++++++++++++++++++++++++---------------
sources | 2 +-
vlc.spec | 28 +-
4 files changed, 4265 insertions(+), 2626 deletions(-)
---