diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
| commit | 5bace4c8ad981b66b5c0769b885d0bb0db91a029 (patch) | |
| tree | 0f2fb95c23d7990d26aeed71590bb94a3f2e17fe /gnu/packages/video.scm | |
| parent | 653569e878f39345b05110b998f10db3b520ccfe (diff) | |
| parent | 20d87dfb453cf27f95c5ef3858e8d096278e1702 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8a91a97017..702704ed46 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1449,6 +1449,7 @@ filtering and encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities.") + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) ;; Software with various licenses is included, see License.txt. (license license:gpl2+))) |