diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 01:49:46 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 01:49:46 -0300 |
| commit | b8be8316e6cf62713329cb15d77411658d7cb447 (patch) | |
| tree | e5486c1e5bb7baa1e5356fb8de18beb263f51fbb /extra/ffmpeg | |
| parent | f8f8c2edc0a58f29e716f32453ee296980faef03 (diff) | |
| parent | 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/libtirpc/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/imap/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 12b7e0d74..074b52487 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128284 2011-06-22 13:37:20Z ibiru $ +# $Id: PKGBUILD 132398 2011-07-24 09:00:59Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110622 +pkgver=20110724 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -14,6 +14,7 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' ' makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) +md5sums=('b6815ae13a17ab57449269bc2156546e') build() { cd "$srcdir/$pkgname" |