diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
| commit | b4e4bd9b44479ab23dbbeaf58ba35e25ff345df1 (patch) | |
| tree | 49dafd3110cca5d6f5054d4f9ef04957ec7b53a6 /extra/ffmpeg | |
| parent | 7d33f92ae992837f61fe5db4535e95dfec6924fa (diff) | |
| parent | c9738c6a1d438f30dfa7363aa847343754f953ac (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
community/libfm/PKGBUILD
community/sxiv/PKGBUILD
extra/pulseaudio/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index a6ecd5944..0e6efae5f 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181002 2013-03-29 15:14:37Z bpiotrowski $ +# $Id: PKGBUILD 181138 2013-04-01 07:43:20Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=1.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -39,6 +39,7 @@ build() { --disable-debug \ --disable-static \ --enable-avresample \ + --enable-dxva2 \ --enable-fontconfig \ --enable-gpl \ --enable-libass \ @@ -64,6 +65,7 @@ build() { --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ + --enable-vdpau \ --enable-version3 \ --enable-x11grab \ $extraconf |