Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/234699
Change subject: Use backported ffmpeg for multimedia transcoding on Trusty ...................................................................... Use backported ffmpeg for multimedia transcoding on Trusty Reverts Ibddeeb9, since we're switching from the Ubuntu-provided libav-tools (avconv) to a backported ffmpeg with newer codec support. Bug: T110707 Bug: T104747 Change-Id: I7356e59fa9563665632677ccb4d753b11154c229 --- M modules/mediawiki/manifests/packages/multimedia.pp 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/234699/1 diff --git a/modules/mediawiki/manifests/packages/multimedia.pp b/modules/mediawiki/manifests/packages/multimedia.pp index 973e6c9..e89ced2 100644 --- a/modules/mediawiki/manifests/packages/multimedia.pp +++ b/modules/mediawiki/manifests/packages/multimedia.pp @@ -3,14 +3,8 @@ # Provisions packages used by MediaWiki for image and video processing. # class mediawiki::packages::multimedia { - if os_version('ubuntu >= trusty') { - $libav_package = 'libav-tools' - } else { - $libav_package = 'ffmpeg' - } - package { [ - $libav_package, + 'ffmpeg', 'ffmpeg2theora', 'fontconfig-config', 'ghostscript', -- To view, visit https://gerrit.wikimedia.org/r/234699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7356e59fa9563665632677ccb4d753b11154c229 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits