diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-12 23:14:51 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-12 23:14:51 +0000 |
| commit | b5f690637837ff269bf5d248ee2dc37ea5236ca8 (patch) | |
| tree | e63126d6f2f33cb2d56549f0657e1ce075e3acc9 /extra/ffmpeg | |
| parent | 3a0439ec6aea4411ac6d11c90cd8220f8f12a660 (diff) | |
Thu Jan 12 23:14:51 UTC 2012
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/ffmpeg/revert-enabling-threads.patch | 15 |
2 files changed, 23 insertions, 4 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 24489add5..c8c5e77c8 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146396 2012-01-10 13:06:16Z ibiru $ +# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20120110 +pkgver=20120111 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -13,12 +13,16 @@ license=('GPL') depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) makedepends=('yasm' 'git' 'libvdpau') #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) -md5sums=('a8121ae2fbe83044ac27501e3f58780d') +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz + revert-enabling-threads.patch) +md5sums=('7a54b2b1af86a746696d1c0b2a79979c' + '79cc22bc2ac3e67d96c340cb7061e64d') build() { cd "$srcdir/$pkgname" + patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch" + ./configure \ --prefix=/usr \ --enable-libmp3lame \ diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch new file mode 100644 index 000000000..dd50332ee --- /dev/null +++ b/extra/ffmpeg/revert-enabling-threads.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921 + +diff --git a/libavcodec/options.c b/libavcodec/options.c +index 4ac9313..4ac92fd 100644 +--- a/libavcodec/options.c ++++ b/libavcodec/options.c +@@ -370,7 +370,7 @@ static const AVOption options[]={ + {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"}, + #endif + {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, +-{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"}, ++{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"}, + {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, + {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, + {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, |