[ffmpeg/f28: 2/2] Merge branch 'f29' into f28
commit aa225a59008446e238979813b0864e08ea4da77a
Merge: f1b76f1 cb23698
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Mar 28 23:04:46 2019 +0000
Merge branch 'f29' into f28
...lsubtitles-Fixes-denial-of-service-due-to.patch | 65 ----------------------
...lsubtitles-Fixes-denial-of-service-due-to.patch | 64 ---------------------
...aomenc-remove-AVOption-related-to-frame-p.patch | 34 -----------
ffmpeg.spec | 24 +++-----
sources | 2 +-
5 files changed, 9 insertions(+), 180 deletions(-)
---