diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
| commit | 5c0a5f2b9fa7f1683f279728342aa7f5f0cf90a3 (patch) | |
| tree | a55da6178b48e7abe9508505d3e92cf02a03da52 /extra/ffmpeg | |
| parent | c56b2c50f5748090efb9f10f2a021e57a2455764 (diff) | |
| parent | 1a136cf48dd7f710f38ff998182508f5a0d41c35 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/comix/PKGBUILD
community/geany/PKGBUILD
community/gnome-do-docklets/PKGBUILD
community/gnome-do-plugins/PKGBUILD
community/gnome-system-tools/PKGBUILD
community/gnustep-make/PKGBUILD
community/gtweakui/PKGBUILD
community/hwinfo/PKGBUILD
community/kungfu/PKGBUILD
community/liboauth/PKGBUILD
community/liboobs/PKGBUILD
community/lua-lzlib/PKGBUILD
community/mcdp/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-runtime/PKGBUILD
community/mplayer2/PKGBUILD
community/pdf2svg/PKGBUILD
community/perl-data-dumper/PKGBUILD
community/perl-digest-md5/PKGBUILD
community/perl-perlio-eol/PKGBUILD
community/perl-xml-libxslt/PKGBUILD
community/python-cherrypy/PKGBUILD
community/python-pexpect/PKGBUILD
community/python-pyro/PKGBUILD
community/python2-cherrypy/PKGBUILD
community/rexima/PKGBUILD
community/shp2svg/PKGBUILD
community/system-tools-backends/PKGBUILD
community/tracker/PKGBUILD
community/virtualbox/PKGBUILD
core/bridge-utils/PKGBUILD
extra/avidemux/PKGBUILD
extra/beagle/PKGBUILD
extra/bug-buddy/PKGBUILD
extra/dssi/PKGBUILD
extra/evolution-sharp/PKGBUILD
extra/evolution-webcal/PKGBUILD
extra/feh/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gnome-mag/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gok/PKGBUILD
extra/gpsd/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/hyphen/PKGBUILD
extra/kdelibs/PKGBUILD
extra/keytouch-editor/PKGBUILD
extra/keytouch/PKGBUILD
extra/koffice/PKGBUILD
extra/krusader/PKGBUILD
extra/libbeagle/PKGBUILD
extra/libffi/PKGBUILD
extra/libgnomeuimm/PKGBUILD
extra/libreoffice/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
extra/openbabel/PKGBUILD
extra/poppler/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/transmission/PKGBUILD
extra/xf86-input-synaptics/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xinit/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/icecat/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-ncurses/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-talloc/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0bbd13537..3965375d6 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $ +# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110923 +pkgver=20111003 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('36111c640a2eea19f677924ac3193ce4' +md5sums=('38139817bee918a5664c549adb487468' '081d03278559a351322157a441fabcf5') build() { |