diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-11-01 10:29:59 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-11-01 10:29:59 +0200 |
| commit | 19b7bba1b5f115168b1669325cd51bc66b9dc4b4 (patch) | |
| tree | 7b4e77080fe6fbc3a54b8612adc3c5c27ab81d05 /gnu/packages/gstreamer.scm | |
| parent | f37931d6632627a24e4eccafa1603ffadb649ff6 (diff) | |
| parent | 5010d0e36452882eb95666467bb983efa8cca081 (diff) | |
| download | guix-19b7bba1b5f115168b1669325cd51bc66b9dc4b4.tar guix-19b7bba1b5f115168b1669325cd51bc66b9dc4b4.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
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 c308dc9f34..c87465db09 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -409,7 +409,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.3) ("orc" ,orc) ("zlib" ,zlib))) (home-page "http://gstreamer.freedesktop.org/") |