[arch-commits] Commit in mlt/repos (6 files)

2017-08-18 Thread Antonio Rojas 
Date: Saturday, August 19, 2017 @ 03:18:35
  Author: arojas
Revision: 302388

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  mlt/repos/extra-i686/PKGBUILD
(from rev 302387, mlt/trunk/PKGBUILD)
  mlt/repos/extra-i686/mlt-glibc-2.26.patch
(from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
  mlt/repos/extra-x86_64/PKGBUILD
(from rev 302387, mlt/trunk/PKGBUILD)
  mlt/repos/extra-x86_64/mlt-glibc-2.26.patch
(from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
Deleted:
  mlt/repos/extra-i686/PKGBUILD
  mlt/repos/extra-x86_64/PKGBUILD

---+
 /PKGBUILD |  160 
 extra-i686/PKGBUILD   |   76 -
 extra-i686/mlt-glibc-2.26.patch   |   28 ++
 extra-x86_64/PKGBUILD |   76 -
 extra-x86_64/mlt-glibc-2.26.patch |   28 ++
 5 files changed, 216 insertions(+), 152 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2017-08-19 03:18:05 UTC (rev 302387)
+++ extra-i686/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas 
-# Contributor: Sergej Pupykin 
-# Contributor: Fabian Schoelzel 
-# Contributor: funkyou 
-# Contributor: tardo 
-# Contributor: Stefan Husmann 
-# Contributor: Gustavo Alvarez 
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=6.4.1
-pkgrel=7
-pkgdesc="An open source multimedia framework"
-arch=(i686 x86_64)
-url="http://www.mltframework.org;
-license=(GPL)
-makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg 
vid.stab qt5-svg jack libexif python2 swig movit eigen)
-source=("https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz;
-
kdenlive-crash-on-exit.patch::"https://github.com/mltframework/mlt/commit/a3188e30.patch;)
-sha256sums=('87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382'
-'537562790e64d818c8ca9c410632662b6cd383335198ba36f3909e10217b14d7')
-
-prepare() {
-  cd $pkgname-$pkgver
-# Fix kdenlive cash on exit
-  patch -p1 -i ../kdenlive-crash-on-exit.patch
-}
-
-build() {
-  # mlt
-  cd mlt-$pkgver
-
-  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr \
-   --avformat-swscale \
-   --enable-gpl --enable-gpl3 \
-   --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
-  make
-
-  # mlt python bindings
-  cd src/swig/python
-  sed -i 's_path=`which python_path=`which python2_' build
-  sed -i 's_`python -c_`python2 -c_' build
-  sed -i 's#python-config#python2-config#' build
-  ./build
-}
-
-package_mlt() {
-  optdepends=('sdl_image: for SDL plugin'
-   'libsamplerate: for libavresample plugin'
-   'sox: for SOX (Audio Swiss Army Knife) plugin'
-   'ffmpeg: for ffmpeg plugin'
-   'vid.stab: for video stabilize plugin'
-   'gtk2: Gtk plugin'
-   'qt5-svg: for Qt5 plugins'
-   'jack: for JACK sound output plugin'
-'ladspa: for LADSPA plugins'
-   'libexif: for auto rotate plugin'
-   'frei0r-plugins: for additional effects'
-   'movit: opengl plugin')
-  conflicts=('mlt++<=0.3.8')
-
-  cd mlt-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
-  depends=(python2 mlt)
-
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  mkdir -p "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
-  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}

Copied: mlt/repos/extra-i686/PKGBUILD (from rev 302387, mlt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Antonio Rojas 
+# Contributor: Sergej Pupykin 
+# Contributor: Fabian Schoelzel 
+# Contributor: funkyou 
+# Contributor: tardo 
+# Contributor: Stefan Husmann 
+# Contributor: Gustavo Alvarez 
+
+pkgbase=mlt
+pkgname=(mlt mlt-python-bindings)
+pkgver=6.4.1
+pkgrel=8
+pkgdesc="An open source multimedia framework"
+arch=(i686 x86_64)
+url="http://www.mltframework.org;
+license=(GPL)
+makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg 
vid.stab qt5-svg jack libexif python2 swig movit eigen)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz;
+
kdenlive-crash-on-exit.patch::"https://github.com/mltframework/mlt/commit/a3188e30.patch;
+mlt-glibc-2.26.patch)

[arch-commits] Commit in mlt/repos (6 files)

2016-02-15 Thread Antonio Rojas 
Date: Tuesday, February 16, 2016 @ 00:06:21
  Author: arojas
Revision: 259359

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  mlt/repos/staging-i686/
  mlt/repos/staging-i686/PKGBUILD
(from rev 259358, mlt/trunk/PKGBUILD)
  mlt/repos/staging-x86_64/
  mlt/repos/staging-x86_64/PKGBUILD
(from rev 259358, mlt/trunk/PKGBUILD)
Deleted:
  mlt/repos/staging-i686/PKGBUILD
  mlt/repos/staging-x86_64/PKGBUILD

-+
 /PKGBUILD   |  154 ++
 staging-i686/PKGBUILD   |   72 -
 staging-x86_64/PKGBUILD |   72 -
 3 files changed, 154 insertions(+), 144 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2016-01-31 16:21:43 UTC (rev 258718)
+++ staging-i686/PKGBUILD   2016-02-15 23:06:21 UTC (rev 259359)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas 
-# Contributor: Sergej Pupykin 
-# Contributor: Fabian Schoelzel 
-# Contributor: funkyou 
-# Contributor: tardo 
-# Contributor: Stefan Husmann 
-# Contributor: Gustavo Alvarez 
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=0.9.8
-pkgrel=5
-pkgdesc="An open source multimedia framework"
-arch=(i686 x86_64)
-url="http://www.mltframework.org;
-license=(GPL)
-makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg 
vid.stab qt5-svg jack libexif python2 swig movit eigen)
-source=("https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz;)
-md5sums=('57397f2f0fa0545c248c5e9b59c140d5')
-
-prepare() {
-  cd mlt-$pkgver
-  sed -i 's|freetype/|freetype2/|' src/modules/gtk2/producer_pango.c
-}
-
-build() {
-  # mlt
-  cd mlt-$pkgver
-
-  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr \
-   --avformat-swscale \
-   --enable-gpl --enable-gpl3 \
-   --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
-  make
-
-  # mlt python bindings
-  cd src/swig/python
-  sed -i 's_path=`which python_path=`which python2_' build
-  sed -i 's_`python -c_`python2 -c_' build
-  sed -i 's#python-config#python2-config#' build
-  ./build
-}
-
-package_mlt() {
-  optdepends=('sdl_image: for SDL plugin'
-   'libsamplerate: for libavresample plugin'
-   'sox: for SOX (Audio Swiss Army Knife) plugin'
-   'ffmpeg: for ffmpeg plugin'
-   'vid.stab: for video stabilize plugin'
-   'gtk2: Gtk plugin'
-   'qt5-svg: for Qt5 plugins'
-   'jack: for JACK sound output plugin'
-   'libexif: for auto rotate plugin'
-   'frei0r-plugins: for additional effects'
-   'movit: opengl plugin')
-  conflicts=('mlt++<=0.3.8')
-
-  cd mlt-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
-  depends=(python2 mlt)
-
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  mkdir -p "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
-  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}

Copied: mlt/repos/staging-i686/PKGBUILD (from rev 259358, mlt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-02-15 23:06:21 UTC (rev 259359)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Antonio Rojas 
+# Contributor: Sergej Pupykin 
+# Contributor: Fabian Schoelzel 
+# Contributor: funkyou 
+# Contributor: tardo 
+# Contributor: Stefan Husmann 
+# Contributor: Gustavo Alvarez 
+
+pkgbase=mlt
+pkgname=(mlt mlt-python-bindings)
+pkgver=0.9.8
+pkgrel=6
+pkgdesc="An open source multimedia framework"
+arch=(i686 x86_64)
+url="http://www.mltframework.org;
+license=(GPL)
+makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg 
vid.stab qt5-svg jack libexif python2 swig movit eigen)
+source=("https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz;
+   
mlt-ffmpeg3.patch::"https://github.com/mltframework/mlt/commit/97c2dd0d.patch;)
+md5sums=('57397f2f0fa0545c248c5e9b59c140d5'
+ '32b4e88d82285ac43bca73a5ecb77e1d')
+
+prepare() {
+  cd mlt-$pkgver
+  sed -i 's|freetype/|freetype2/|' src/modules/gtk2/producer_pango.c
+
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../mlt-ffmpeg3.patch
+}
+
+build() {
+  # mlt
+  cd mlt-$pkgver
+
+  msg "SSE2=$SSE2"
+  ./configure --prefix=/usr \
+   --avformat-swscale \
+   --enable-gpl --enable-gpl3 \
+   --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
+  make
+
+  # mlt python bindings
+  cd src/swig/python
+  sed -i 's_path=`which

[arch-commits] Commit in mlt/repos (6 files)

2015-03-13 Thread Antonio Rojas 
Date: Friday, March 13, 2015 @ 21:55:58
  Author: arojas
Revision: 233598

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  mlt/repos/extra-i686/
  mlt/repos/extra-i686/PKGBUILD
(from rev 233597, mlt/trunk/PKGBUILD)
  
mlt/repos/extra-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 233597, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
  mlt/repos/extra-x86_64/
  mlt/repos/extra-x86_64/PKGBUILD
(from rev 233597, mlt/trunk/PKGBUILD)
  
mlt/repos/extra-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 233597, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)

-+
 extra-i686/PKGBUILD |   63 
++
 extra-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch   |   37 
+
 extra-x86_64/PKGBUILD   |   63 
++
 extra-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch |   37 
+
 4 files changed, 200 insertions(+)

Copied: mlt/repos/extra-i686/PKGBUILD (from rev 233597, mlt/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-13 20:55:58 UTC (rev 233598)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.9.6
+pkgrel=1
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 
'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' jack ladspa vid.stab)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('92bcc95af44ff086df0a0ce17a201d1c'
+ '8227e7a1b059b1b16901166d2a508317')
+
+prepare() {
+  cd $srcdir/mlt-$pkgver
+  sed -i 's|freetype/|freetype2/|' src/modules/gtk2/producer_pango.c
+}
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr \
+   --avformat-swscale \
+   --enable-gpl --enable-gpl3
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 
'frei0r-plugins' 'vid.stab')
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: 
mlt/repos/extra-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch 
(from rev 233597, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===
--- extra-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch   
(rev 0)
+++ extra-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch   
2015-03-13 20:55:58 UTC (rev 233598)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat nico...@boichat.ch
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
 b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+return 0;
+ }
+ 
++static void avformat_exit( )
++{
++  av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+   // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+   avformat_network_init();
+ #endif
+   av_log_set_level( mlt_log_get_level() );
++  atexit(avformat_exit);
+   }
+ }
+ 
+-- 
+1.8.1.5
+

Copied: mlt/repos/extra-x86_64/PKGBUILD (from rev 233597,

[arch-commits] Commit in mlt/repos (6 files)

2015-03-13 Thread Antonio Rojas 
Date: Friday, March 13, 2015 @ 22:07:15
  Author: arojas
Revision: 233600

archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64

Added:
  mlt/repos/kde-unstable-i686/
  mlt/repos/kde-unstable-i686/PKGBUILD
(from rev 233599, mlt/kde-unstable/PKGBUILD)
  
mlt/repos/kde-unstable-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 233599, 
mlt/kde-unstable/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
  mlt/repos/kde-unstable-x86_64/
  mlt/repos/kde-unstable-x86_64/PKGBUILD
(from rev 233599, mlt/kde-unstable/PKGBUILD)
  
mlt/repos/kde-unstable-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 233599, 
mlt/kde-unstable/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)

+
 kde-unstable-i686/PKGBUILD 
|   63 ++
 kde-unstable-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch   
|   37 +
 kde-unstable-x86_64/PKGBUILD   
|   63 ++
 kde-unstable-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch 
|   37 +
 4 files changed, 200 insertions(+)

Copied: mlt/repos/kde-unstable-i686/PKGBUILD (from rev 233599, 
mlt/kde-unstable/PKGBUILD)
===
--- kde-unstable-i686/PKGBUILD  (rev 0)
+++ kde-unstable-i686/PKGBUILD  2015-03-13 21:07:15 UTC (rev 233600)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.9.6
+pkgrel=2
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt5-svg' 'sox' 'libxml2' 
'gtk2' 'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' 'jack' 'ladspa' 'vid.stab')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('92bcc95af44ff086df0a0ce17a201d1c'
+ '8227e7a1b059b1b16901166d2a508317')
+
+prepare() {
+  cd $srcdir/mlt-$pkgver
+  sed -i 's|freetype/|freetype2/|' src/modules/gtk2/producer_pango.c
+}
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr \
+   --avformat-swscale \
+   --enable-gpl --enable-gpl3
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'frei0r-plugins' 
'vid.stab')
+  optdepends=('jack' 'libexif' 'qt5-svg' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: 
mlt/repos/kde-unstable-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 (from rev 233599, 
mlt/kde-unstable/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===
--- 
kde-unstable-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(rev 0)
+++ 
kde-unstable-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
2015-03-13 21:07:15 UTC (rev 233600)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat nico...@boichat.ch
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
 b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+return 0;
+ }
+ 
++static void avformat_exit( )
++{
++  av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+   // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+   avformat_network_init();
+ #endif
+

[arch-commits] Commit in mlt/repos (6 files)

2014-09-17 Thread Sergej Pupykin 
Date: Wednesday, September 17, 2014 @ 20:56:08
  Author: spupykin
Revision: 119113

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mlt/repos/community-staging-i686/
  mlt/repos/community-staging-i686/PKGBUILD
(from rev 119112, mlt/trunk/PKGBUILD)
  
mlt/repos/community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 119112, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
  mlt/repos/community-staging-x86_64/
  mlt/repos/community-staging-x86_64/PKGBUILD
(from rev 119112, mlt/trunk/PKGBUILD)
  
mlt/repos/community-staging-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 119112, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)

-+
 community-staging-i686/PKGBUILD
 |   63 ++
 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   |   37 +
 community-staging-x86_64/PKGBUILD  
 |   63 ++
 
community-staging-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 |   37 +
 4 files changed, 200 insertions(+)

Copied: mlt/repos/community-staging-i686/PKGBUILD (from rev 119112, 
mlt/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-09-17 18:56:08 UTC (rev 119113)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.9.2
+pkgrel=2
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 
'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' jack ladspa)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('f88ead8fcea628a65ebf329cc4470b6d'
+ '8227e7a1b059b1b16901166d2a508317')
+
+prepare() {
+  cd $srcdir/mlt-$pkgver
+  sed -i 's|freetype/|freetype2/|' src/modules/gtk2/producer_pango.c
+}
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr \
+   --avformat-swscale \
+   --enable-gpl --enable-gpl3
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 
'frei0r-plugins')
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: 
mlt/repos/community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 (from rev 119112, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===
--- 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   (rev 0)
+++ 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   2014-09-17 18:56:08 UTC (rev 119113)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat nico...@boichat.ch
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
 b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+return 0;
+ }
+ 
++static void avformat_exit( )
++{
++  av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+   // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+

[arch-commits] Commit in mlt/repos (6 files)

2013-07-12 Thread Sergej Pupykin 
Date: Friday, July 12, 2013 @ 13:33:43
  Author: spupykin
Revision: 93979

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mlt/repos/community-staging-i686/
  mlt/repos/community-staging-i686/PKGBUILD
(from rev 93978, mlt/trunk/PKGBUILD)
  
mlt/repos/community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 93978, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
  mlt/repos/community-staging-x86_64/
  mlt/repos/community-staging-x86_64/PKGBUILD
(from rev 93978, mlt/trunk/PKGBUILD)
  
mlt/repos/community-staging-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 93978, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)

-+
 community-staging-i686/PKGBUILD
 |   59 ++
 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   |   37 ++
 community-staging-x86_64/PKGBUILD  
 |   59 ++
 
community-staging-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 |   37 ++
 4 files changed, 192 insertions(+)

Copied: mlt/repos/community-staging-i686/PKGBUILD (from rev 93978, 
mlt/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-12 11:33:43 UTC (rev 93979)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.9.0
+pkgrel=3
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 
'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' jack ladspa)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('1cd2d73f3ffe77a43980e99aaa4ea06c'
+ '8227e7a1b059b1b16901166d2a508317')
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr --disable-gtk2 \
+   --avformat-vdpau \
+   --avformat-swscale \
+   --enable-gpl --enable-gpl3
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 
'frei0r-plugins')
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: 
mlt/repos/community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 (from rev 93978, 
mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===
--- 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   (rev 0)
+++ 
community-staging-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
   2013-07-12 11:33:43 UTC (rev 93979)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat nico...@boichat.ch
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
 b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+return 0;
+ }
+ 
++static void avformat_exit( )
++{
++  av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+   // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+   avformat_network_init();
+ #endif
+   av_log_set_level( mlt_log_get_level() );
++

[arch-commits] Commit in mlt/repos (6 files)

2013-02-26 Thread Andrea Scarpino 
Date: Tuesday, February 26, 2013 @ 18:38:57
  Author: andrea
Revision: 85012

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mlt/repos/community-staging-i686/
  mlt/repos/community-staging-i686/PKGBUILD
(from rev 85011, mlt/trunk/PKGBUILD)
  mlt/repos/community-staging-i686/ffmpeg.patch
(from rev 85011, mlt/trunk/ffmpeg.patch)
  mlt/repos/community-staging-x86_64/
  mlt/repos/community-staging-x86_64/PKGBUILD
(from rev 85011, mlt/trunk/PKGBUILD)
  mlt/repos/community-staging-x86_64/ffmpeg.patch
(from rev 85011, mlt/trunk/ffmpeg.patch)

---+
 community-staging-i686/PKGBUILD   |   64 
 community-staging-i686/ffmpeg.patch   |   29 ++
 community-staging-x86_64/PKGBUILD |   64 
 community-staging-x86_64/ffmpeg.patch |   29 ++
 4 files changed, 186 insertions(+)

Copied: mlt/repos/community-staging-i686/PKGBUILD (from rev 85011, 
mlt/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-26 17:38:57 UTC (rev 85012)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.8.8
+pkgrel=3
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 
'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' jack ladspa)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   ffmpeg.patch)
+md5sums=('06de4052cffd6760c468d7da9557edae'
+ 'c28b4691d1715432d4de0055f4e2f5eb')
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+#  patch -p1 $srcdir/ffmpeg.patch
+
+  [ $CARCH == i686 ]  SSE2=--disable-sse2 || SSE2=
+#  SSE2=--disable-sse2
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
+   --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
+   --avformat-vdpau \
+   --avformat-swscale $SSE2
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 
'frei0r-plugins')
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: mlt/repos/community-staging-i686/ffmpeg.patch (from rev 85011, 
mlt/trunk/ffmpeg.patch)
===
--- community-staging-i686/ffmpeg.patch (rev 0)
+++ community-staging-i686/ffmpeg.patch 2013-02-26 17:38:57 UTC (rev 85012)
@@ -0,0 +1,29 @@
+diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c 
mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
+--- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 
20:25:58.0 +0400
 mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c  2012-11-06 
16:03:07.269782436 +0400
+@@ -237,11 +237,7 @@
+   mlt_properties_set_data( properties, acodec, codecs, 0, 
(mlt_destructor) mlt_properties_close, NULL );
+   mlt_properties_set_data( doc, audio_codecs, codecs, 0, NULL, 
NULL );
+   while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT = ((5416)+(08)+0)
+-  if ( ( codec-encode || codec-encode2 )  codec-type 
== CODEC_TYPE_AUDIO )
+-#else
+-  if ( codec-encode  codec-type == CODEC_TYPE_AUDIO )
+-#endif
++  if ( ( codec-encode2 )  codec-type == 
CODEC_TYPE_AUDIO )
+   {
+   snprintf( key, sizeof(key), %d, 
mlt_properties_count( codecs ) );
+   mlt_properties_set( codecs, key, codec-name );
+@@ -261,11 +257,7 @@
+   mlt_properties_set_data( properties, vcodec, codecs, 0, 
(mlt_destructor) mlt_properties_close, NULL );
+   mlt_properties_set_data( doc, video_codecs, codecs, 0, NULL, 
NULL );
+

[arch-commits] Commit in mlt/repos (6 files)

2013-02-07 Thread Sergej Pupykin 
Date: Thursday, February 7, 2013 @ 13:43:31
  Author: spupykin
Revision: 83955

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mlt/repos/community-staging-i686/
  mlt/repos/community-staging-i686/PKGBUILD
(from rev 83954, mlt/trunk/PKGBUILD)
  mlt/repos/community-staging-i686/ffmpeg.patch
(from rev 83954, mlt/trunk/ffmpeg.patch)
  mlt/repos/community-staging-x86_64/
  mlt/repos/community-staging-x86_64/PKGBUILD
(from rev 83954, mlt/trunk/PKGBUILD)
  mlt/repos/community-staging-x86_64/ffmpeg.patch
(from rev 83954, mlt/trunk/ffmpeg.patch)

---+
 community-staging-i686/PKGBUILD   |   64 
 community-staging-i686/ffmpeg.patch   |   29 ++
 community-staging-x86_64/PKGBUILD |   64 
 community-staging-x86_64/ffmpeg.patch |   29 ++
 4 files changed, 186 insertions(+)

Copied: mlt/repos/community-staging-i686/PKGBUILD (from rev 83954, 
mlt/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-07 12:43:31 UTC (rev 83955)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Fabian Schoelzel myfirstname.mylastn...@googlemail.com
+# Contributor: funkyou spamop...@nickname.berlin.de
+# Contributor: tardo ta...@nagi-fanboi.net
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.8.8
+pkgrel=2
+pkgdesc=An open source multimedia framework
+arch=('i686' 'x86_64')
+url=http://www.mltframework.org;
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 
'ffmpeg'
+'frei0r-plugins' 'swig' 'python2' jack ladspa)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+   ffmpeg.patch)
+md5sums=('06de4052cffd6760c468d7da9557edae'
+ 'c28b4691d1715432d4de0055f4e2f5eb')
+
+build() {
+  # mlt
+  cd $srcdir/mlt-$pkgver
+
+#  patch -p1 $srcdir/ffmpeg.patch
+
+  [ $CARCH == i686 ]  SSE2=--disable-sse2 || SSE2=
+#  SSE2=--disable-sse2
+
+  msg SSE2=$SSE2
+  ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
+   --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
+   --avformat-vdpau \
+   --avformat-swscale $SSE2
+  make
+
+  # mlt python bindings
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  sed -i 's_path=`which python_path=`which python2_' build
+  sed -i 's_`python -c_`python2 -c_' build
+  sed -i 's#python-config#python2-config#' build
+  ./build
+}
+
+package_mlt() {
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 
'frei0r-plugins')
+  optdepends=('jack' 'libexif' 'qt' 'gtk2' ladspa)
+  conflicts=('mlt++=0.3.8')
+
+  cd $srcdir/mlt-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+package_mlt-python-bindings() {
+  depends=('python2' 'mlt')
+
+  cd $srcdir/mlt-$pkgver/src/swig/python
+  mkdir -p $pkgdir/usr/lib/python2.7/
+  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
+  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
+  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+}

Copied: mlt/repos/community-staging-i686/ffmpeg.patch (from rev 83954, 
mlt/trunk/ffmpeg.patch)
===
--- community-staging-i686/ffmpeg.patch (rev 0)
+++ community-staging-i686/ffmpeg.patch 2013-02-07 12:43:31 UTC (rev 83955)
@@ -0,0 +1,29 @@
+diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c 
mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
+--- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 
20:25:58.0 +0400
 mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c  2012-11-06 
16:03:07.269782436 +0400
+@@ -237,11 +237,7 @@
+   mlt_properties_set_data( properties, acodec, codecs, 0, 
(mlt_destructor) mlt_properties_close, NULL );
+   mlt_properties_set_data( doc, audio_codecs, codecs, 0, NULL, 
NULL );
+   while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT = ((5416)+(08)+0)
+-  if ( ( codec-encode || codec-encode2 )  codec-type 
== CODEC_TYPE_AUDIO )
+-#else
+-  if ( codec-encode  codec-type == CODEC_TYPE_AUDIO )
+-#endif
++  if ( ( codec-encode2 )  codec-type == 
CODEC_TYPE_AUDIO )
+   {
+   snprintf( key, sizeof(key), %d, 
mlt_properties_count( codecs ) );
+   mlt_properties_set( codecs, key, codec-name );
+@@ -261,11 +257,7 @@
+   mlt_properties_set_data( properties, vcodec, codecs, 0, 
(mlt_destructor) mlt_properties_close, NULL );
+   mlt_properties_set_data( doc, video_codecs, codecs, 0, NULL, 
NULL );
+