diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
| commit | 1d281894276f404075d12ab90cdc3dbff7a89cd2 (patch) | |
| tree | 609da5609f9606a1d061c6a1b8fa9d8efc02446e /extra/ffmpeg | |
| parent | 905d4583b1cbf6ee0bca36a3c8bebf6552b4cf38 (diff) | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/collectd/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/xulrunner/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/ffmpeg/avutils-make-aes-and-sha-public.patch | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 1bd7fc9b4..6d1e06693 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch new file mode 100644 index 000000000..ac10e4f4a --- /dev/null +++ b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch @@ -0,0 +1,37 @@ +From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001 +From: Alexis Ballier <aballier@gentoo.org> +Date: Thu, 7 Apr 2011 10:19:23 -0300 +Subject: [PATCH] avutil: make aes and sha api public + +The functions are already av_ prefixed and sha1 header is already provided. +Install libavutil/{aes,sha}.h + +Signed-off-by: Michael Niedermayer <michaelni@gmx.at> +Signed-off-by: Luca Barbato <lu_zero@gentoo.org> +--- + libavutil/Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/libavutil/Makefile b/libavutil/Makefile +index 300acb1..baee496 100644 +--- a/libavutil/Makefile ++++ b/libavutil/Makefile +@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak + NAME = avutil + + HEADERS = adler32.h \ ++ aes.h \ + attributes.h \ + audioconvert.h \ + avassert.h \ +@@ -33,6 +34,7 @@ HEADERS = adler32.h \ + random_seed.h \ + rational.h \ + samplefmt.h \ ++ sha.h \ + sha1.h \ + + BUILT_HEADERS = avconfig.h +-- +1.7.2.5 + |