diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
| commit | a9fe3882b9400d6a49ca95e136e78477b3e81a07 (patch) | |
| tree | b724ec1ed54d4a2c1b617a63eb05b98721f5d48a /gnu/packages/gstreamer.scm | |
| parent | 68c4759baa4c1bb87e1c7c5568d5cdf4e1434fb1 (diff) | |
| parent | 0afeda65218ed0c82ab18762111c52a9fedd2582 (diff) | |
| download | guix-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar guix-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a65a43b5cf..da130d88ff 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -403,7 +403,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("orc" ,orc) ("zlib" ,zlib))) (home-page "https://gstreamer.freedesktop.org/") |