diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
| commit | f35184e8782d5fe7fc3ea3f11042b29913cde6d8 (patch) | |
| tree | c984d07cfb1cb491f5e7a71f3771a81001398d74 /extra/ffmpeg | |
| parent | 520f5964346341a33a8337c8fd5b1afa10de6d5b (diff) | |
| parent | 54b7119c36756b86ea463649ee972cd6c1ce5863 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nload/PKGBUILD
core/glibc/PKGBUILD
extra/aalib/PKGBUILD
extra/apache/PKGBUILD
extra/jasper/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libvorbis/PKGBUILD
extra/libxslt/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
staging/xorg-xinput/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index c752fc336..bc3e5920b 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149272 2012-02-06 17:33:26Z ibiru $ +# $Id: PKGBUILD 149381 2012-02-07 10:39:41Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=20120127 -pkgrel=2 +pkgrel=3 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" |