[arch-commits] Commit in gstreamer0.10-bad-plugins/repos/extra-i686 (2 files)

[Jan de Groot]

    Date: Sunday, March 8, 2009 @ 17:01:01
  Author: jgc
Revision: 29484

merge the correct version

Added:
  gstreamer0.10-bad-plugins/repos/extra-i686/gst-x264.patch
    (from rev 29467, gstreamer0.10-bad-plugins/trunk/gst-x264.patch)
Modified:
  gstreamer0.10-bad-plugins/repos/extra-i686/PKGBUILD

----------------+
 PKGBUILD       |    4 ++--
 gst-x264.patch |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-08 20:59:53 UTC (rev 29483)
+++ PKGBUILD	2009-03-08 21:01:01 UTC (rev 29484)
@@ -3,11 +3,11 @@
 
 pkgname=gstreamer0.10-bad-plugins
 pkgver=0.10.10
-pkgrel=2
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
-depends=("gstreamer0.10-bad>=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.7' 'libmms' 'x264>=20090216' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
+depends=("gstreamer0.10-bad>=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394>=2.0.1' 'exempi' 'jack-audio-connection-kit' 'neon>=0.27.2' 'faac>=1.26' 'libexif' 'musicbrainz>=2.1.5' 'faad2>=2.6.1' 'libmms' 'x264>=20090108' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav>=0.1.10')
 makedepends=('pkgconfig' 'ladspa')
 provides=("gstreamer0.10-cdaudio=${pkgver}" "gstreamer0.10-musicbrainz=${pkgver}" "gstreamer0.10-sndfile=${pkgver}" "gstreamer0.10-mpeg2enc=${pkgver}" "gstreamer0.10-bz2=${pkgver}" "gstreamer0.10-sdl=${pkgver}" "gstreamer0.10-faac=${pkgver}" "gstreamer0.10-alsaspdif=${pkgver}" "gstreamer0.10-xvid=${pkgver}" "gstreamer0.10-faad=${pkgver}" "gstreamer0.10-musepack=${pkgver}" "gstreamer0.10-mms=${pkgver}" "gstreamer0.10-x264=${pkgver}" "gstreamer0.10-neon=${pkgver}" "gstreamer0.10-ladspa=${pkgver}" "gstreamer0.10-dts=${pkgver}" "gstreamer0.10-jack=${pkgver}" "gstreamer0.10-metadata=${pkgver}" "gst-plugins-bad=${pkgver}")
 conflicts=('gstreamer0.10-cdaudio' 'gstreamer0.10-musicbrainz' 'gstreamer0.10-sndfile' 'gstreamer0.10-mpeg2enc' 'gstreamer0.10-bz2' 'gstreamer0.10-sdl' 'gstreamer0.10-faac' 'gstreamer0.10-alsaspdif' 'gstreamer0.10-xvid' 'gstreamer0.10-faad' 'gstreamer0.10-musepack' 'gstreamer0.10-mms' 'gstreamer0.10-x264' 'gstreamer0.10-neon' 'gstreamer0.10-ladspa' 'gstreamer0.10-dts' 'gstreamer0.10-jack' 'gstreamer0.10-metadata')

Copied: gstreamer0.10-bad-plugins/repos/extra-i686/gst-x264.patch (from rev 29467, gstreamer0.10-bad-plugins/trunk/gst-x264.patch)
===================================================================
--- gst-x264.patch	                        (rev 0)
+++ gst-x264.patch	2009-03-08 21:01:01 UTC (rev 29484)
@@ -0,0 +1,12 @@
+diff -up gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c.x264 gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c
+--- gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c.x264	2008-10-11 01:13:43.000000000 +0200
++++ gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c	2008-12-14 22:26:13.000000000 +0100
+@@ -541,7 +541,7 @@ gst_x264_enc_init_encoder (GstX264Enc * 
+   encoder->x264param.i_frame_reference = encoder->ref;
+   encoder->x264param.i_bframe = encoder->bframes;
+   encoder->x264param.b_bframe_pyramid = encoder->b_pyramid;
+-  encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
++  encoder->x264param.i_bframe_adaptive = encoder->b_adapt;
+   encoder->x264param.b_interlaced = encoder->interlaced;
+   encoder->x264param.b_deblocking_filter = 1;
+   encoder->x264param.i_deblocking_filter_alphac0 = 0;