[ffmpeg/f28: 24/24] Merge branch 'master' into f28
commit 0eecfcc810641bedff75248ea729798969aa911e
Merge: eecf27c 5b6887b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 19 16:25:18 2019 +0000
Merge branch 'master' into f28
...aomenc-remove-AVOption-related-to-frame-p.patch | 34 -------
ffmpeg.spec | 106 +++++++++++++++------
sources | 2 +-
3 files changed, 78 insertions(+), 64 deletions(-)
---