diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
| commit | 3dc4525661db2630038e019a2a31b71fdcbfb74a (patch) | |
| tree | ea19d09158589c89b949b8cc80d5cd61f8d5b64e /extra/ffmpeg | |
| parent | e41246bc4c78478a71fe801a745210c931c5f2c5 (diff) | |
| parent | 76400556d9e8a5dedc692487c13b76a541813a23 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/wml/PKGBUILD
community/exaile/PKGBUILD
community/libquicktime/PKGBUILD
community/mime-editor/PKGBUILD
community/rutilt/PKGBUILD
community/synbak/PKGBUILD
community/thunar-thumbnailers/PKGBUILD
community/tripwire/PKGBUILD
community/wifi-radar/PKGBUILD
community/xulrunner-oss/PKGBUILD
core/bash/PKGBUILD
core/shadow/PKGBUILD
extra/audacity/PKGBUILD
extra/clucene/PKGBUILD
extra/darcs/PKGBUILD
extra/fprint_demo/PKGBUILD
extra/haskell-binary/PKGBUILD
extra/haskell-dataenc/PKGBUILD
extra/haskell-hashed-storage/PKGBUILD
extra/haskell-haskeline/PKGBUILD
extra/haskell-mmap/PKGBUILD
extra/haskell-tar/PKGBUILD
extra/haskell-terminfo/PKGBUILD
extra/haskell-utf8-string/PKGBUILD
extra/libfprint/PKGBUILD
extra/liferea/PKGBUILD
extra/llvm/PKGBUILD
extra/pam_fprint/PKGBUILD
extra/windowmaker-extra/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libao/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/avutils-make-aes-and-sha-public.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch deleted file mode 100644 index ac10e4f4a..000000000 --- a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - |