diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-09 01:46:34 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-09 01:46:34 -0500 |
| commit | efe2a2833c6d306d0c60127fdfebaff6dc415b4c (patch) | |
| tree | bf842134e1a149770907e1956d28c3a6b207b3f7 /gnu/packages/video.scm | |
| parent | 53f826cd0f429864d46fc3bf6305c14356d0b2ad (diff) | |
| parent | 8d0edc8246389c0f2bb1c8e9c9190c312746a4b4 (diff) | |
| download | patches-efe2a2833c6d306d0c60127fdfebaff6dc415b4c.tar patches-efe2a2833c6d306d0c60127fdfebaff6dc415b4c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e224a3d8cf..931e6390c4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016, 2017 Alex Vong <alexvong1995@gmail.com> +;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com> @@ -1018,6 +1018,9 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (sha256 (base32 "1d2p6k3y9lqx8bpdal4grrj8ljy7pvd8qgdq8004fmr38afmbb7f")) + (patches (search-patches "mpv-CVE-2018-6360-1.patch" + "mpv-CVE-2018-6360-2.patch" + "mpv-CVE-2018-6360-3.patch")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs |