[ffmpeg/el7: 50/52] Merge branch 'f23' into el7
commit 8f665202744674e3a905b2122b77e571c6fc5d0b
Merge: b989f51 61f3bda
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 3 11:28:05 2017 +0100
Merge branch 'f23' into el7
.gitignore | 5 +-
ffmpeg.spec | 246 +++++++++++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 182 insertions(+), 71 deletions(-)
---