[arch-commits] Commit in ffmpeg/trunk (PKGBUILD revert-enabling-threads.patch)

[Ionut Biru]

    Date: Friday, January 27, 2012 @ 05:38:02
  Author: ibiru
Revision: 147713

new snapshot

Modified:
  ffmpeg/trunk/PKGBUILD
Deleted:
  ffmpeg/trunk/revert-enabling-threads.patch

-------------------------------+
 PKGBUILD                      |   10 +++-------
 revert-enabling-threads.patch |   15 ---------------
 2 files changed, 3 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-27 10:35:31 UTC (rev 147712)
+++ PKGBUILD	2012-01-27 10:38:02 UTC (rev 147713)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120111
+pkgver=20120127
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -13,16 +13,12 @@
 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
-        revert-enabling-threads.patch)
-md5sums=('7a54b2b1af86a746696d1c0b2a79979c'
-         '79cc22bc2ac3e67d96c340cb7061e64d')
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
+md5sums=('dc706cdb31801b4746f37459b0c38b7e')
 
 build() {
   cd "$srcdir/$pkgname"
 
-  patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
-
   ./configure \
     --prefix=/usr \
     --enable-libmp3lame \

Deleted: revert-enabling-threads.patch
===================================================================
--- revert-enabling-threads.patch	2012-01-27 10:35:31 UTC (rev 147712)
+++ revert-enabling-threads.patch	2012-01-27 10:38:02 UTC (rev 147713)
@@ -1,15 +0,0 @@
-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},