diff options
author | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
commit | ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3 (patch) | |
tree | 1b3e014c4e0398ecb63d1b88ee06b09d0c0c5a56 /gnu/packages/video.scm | |
parent | f08add0c5a3f1f7200b0a00e17ed880692d2244b (diff) | |
parent | 903276d066ab9733c253d2a15b7ae135ef2ef836 (diff) | |
download | guix-ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3.tar guix-ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r-- | gnu/packages/video.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cded1bf4d0..cdc9193c14 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -403,14 +403,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.1.4") + (version "3.1.5") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0nvb2k0maj5g8llfg47j8z5xpvp4q3g9pab2pp6vpjd5vmwb6358")))) + "16mqb1fs6ahqqv6a64dk4d8rp75ixdsipfzsz0vmc749yw2k3k29")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -792,7 +792,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (string-append @@ -800,7 +800,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "0mibhjg5skcwcfpg6dx7yi2gj14xawnq2jzmcfwq9knmvv9cjvpy")) + "1lwvvhldqrkp44zdm3wbi7qrsln13s8ympwwckqhwl4whp78wpyh")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs |