diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
| commit | 571fb008a576378883c053be186d2c620290ea39 (patch) | |
| tree | 5279a2c2772a9b76299a48d697d568f208a89722 /gnu/packages/video.scm | |
| parent | 7c86fdda7ceed11377b0e17b47c91598be59be52 (diff) | |
| parent | f125c5a5ea03d53749f45d310694b79241d5888d (diff) | |
| download | patches-571fb008a576378883c053be186d2c620290ea39.tar patches-571fb008a576378883c053be186d2c620290ea39.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 16ab160d0b..87e1b0b959 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -935,14 +935,14 @@ audio/video codec library.") (define-public ffmpeg-3.4 (package (inherit ffmpeg) - (version "3.4.5") + (version "3.4.6") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))) + "0gmqbhg5jjcfanrxrl657zn12lzz73sfs8xwryfy7n9rn6f2fwim")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags flags) @@ -1841,7 +1841,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.7.2") + (version "2.7.3") (source (origin (method url-fetch) (uri (string-append @@ -1849,7 +1849,7 @@ for use with HTML5 video.") "avidemux_" version ".tar.gz")) (sha256 (base32 - "07fdz3y4iln7cizikdjj96dqvp2f8zzhs31ncxxwzdkngn5v8138")) + "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -1878,7 +1878,7 @@ for use with HTML5 video.") ("yasm" ,yasm) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:phases ;; Make sure files inside the included ffmpeg tarball are ;; patch-shebanged. |