[arch-commits] Commit in cinelerra-cv/repos (8 files)

2018-02-26 Thread David Runge via arch-commits
Date: Monday, February 26, 2018 @ 23:40:06
  Author: dvzrv
Revision: 298843

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 298842, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 298842, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 298842, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 298842, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   79 
 cinelerra-cv-ffmpeg3.patch |  681 +++
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 7 files changed, 1203 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 298842, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-02-26 23:40:06 UTC (rev 298843)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+_name=CinelerraCV
+pkgname=cinelerra-cv
+pkgver=2.3
+pkgrel=3
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="https://cinelerra-cv.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+
+  ## Patches (oldest first) ##
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-mmx \
+  --disable-esd
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+-vDm644 {AUTHORS,ChangeLog,NEWS,README.BUILD,TODO}

[arch-commits] Commit in cinelerra-cv/repos (8 files)

2017-12-29 Thread Maxime Gauduin via arch-commits
Date: Friday, December 29, 2017 @ 17:02:21
  Author: alucryd
Revision: 276869

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 276868, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 276868, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 276868, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 276868, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   98 ++
 cinelerra-cv-ffmpeg3.patch |  681 +++
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 7 files changed, 1222 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 276868, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2017-12-29 17:02:21 UTC (rev 276869)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+pkgname=cinelerra-cv
+pkgver=2.3
+_gitrel=2.3.0
+pkgrel=2
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("$pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel"
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+   'cinelerra-cv-ffmpeg3.patch'
+   'ffmpeg-link.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '7bf8fe04ce242d8aa76dba94897eac4e'
+ '4d45860f1780b5e42fbbfc0e35614cdd'
+ '0338a22d2785ef52c908574bb323ab02')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  #sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  #sed -i -e '/Debian/d' admin/nasm
+
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  ## More Hacks (must be in existing env) ##
+
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+
+  ./autogen.sh
+
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-mmx \
+  --disable-esd
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 
(from rev 276868, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
===
--- community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 
(rev 0)
+++ community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 2017-12-29 17:02:21 UTC 
(rev 276869)
@@ -0,0 +1,681 @@
+Index: cinelerra-20140710/cinelerra/ffmpeg.C

[arch-commits] Commit in cinelerra-cv/repos (8 files)

2013-04-17 Thread Ray Rashif
Date: Wednesday, April 17, 2013 @ 23:57:11
  Author: schiv
Revision: 88445

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

Added:
  cinelerra-cv/repos/community-testing-i686/
  cinelerra-cv/repos/community-testing-i686/PKGBUILD
(from rev 88444, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch
(from rev 88444, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-i686/v4l1_removal.patch
(from rev 88444, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-testing-x86_64/
  cinelerra-cv/repos/community-testing-x86_64/PKGBUILD
(from rev 88444, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-x86_64/ffmpeg_api.patch
(from rev 88444, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-x86_64/v4l1_removal.patch
(from rev 88444, cinelerra-cv/trunk/v4l1_removal.patch)

-+
 community-testing-i686/PKGBUILD |   81 
 community-testing-i686/ffmpeg_api.patch |  163 ++
 community-testing-i686/v4l1_removal.patch   |  125 +++
 community-testing-x86_64/PKGBUILD   |   81 
 community-testing-x86_64/ffmpeg_api.patch   |  163 ++
 community-testing-x86_64/v4l1_removal.patch |  125 +++
 6 files changed, 738 insertions(+)

Copied: cinelerra-cv/repos/community-testing-i686/PKGBUILD (from rev 88444, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-04-17 21:57:11 UTC (rev 88445)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=14
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+options=('!libtool')
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # TODO: check if this is still needed (not sure what it does) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
+  sed -i '/\/X11R6/s///' configure.in
+}
+
+build() {
+  cd $srcdir/$pkgname
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
+  ./autogen.sh
+
+  # TODO: check if this is still needed (forgot why at all) --schiv
+  if [ $CARCH = 'x86_64' ]; then
+_confit --disable-mmx
+  else
+_confit --enable-mmx
+  fi
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch (from rev 
88444, cinelerra-cv/trunk/ffmpeg_api.patch)
===
--- community-testing-i686/ffmpeg_api.patch (rev 0)
+++ community-testing-i686/ffmpeg_api.patch 2013-04-17 21:57:11 UTC (rev 
88445)
@@ -0,0 +1,163 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..7cde503 100644
+--- a/cinelerra/ffmpeg.C
 b/cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-  avcodec_init();
+   avcodec_register_all();
+ 
+   CodecID id = codec_id(codec_string);
+@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame 
*frame_out) {
+ 
+   // NOTE: frame must already have data space allocated
+   
++  AVPacket pkt;
+   got_picture = 0;
+-  int length = avcodec_decode_video(context,
++  av_init_packet( pkt );
++  pkt.data = data;
++  pkt.size = data_size;
++  int 

[arch-commits] Commit in cinelerra-cv/repos (8 files)

2013-02-10 Thread Bartłomiej Piotrowski
Date: Sunday, February 10, 2013 @ 11:48:34
  Author: bpiotrowski
Revision: 84083

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

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 84082, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 84082, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 84082, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 84082, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 84082, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 84082, cinelerra-cv/trunk/v4l1_removal.patch)

-+
 community-staging-i686/PKGBUILD |   89 ++
 community-staging-i686/ffmpeg_api.patch |  163 ++
 community-staging-i686/v4l1_removal.patch   |  125 +++
 community-staging-x86_64/PKGBUILD   |   89 ++
 community-staging-x86_64/ffmpeg_api.patch   |  163 ++
 community-staging-x86_64/v4l1_removal.patch |  125 +++
 6 files changed, 754 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 84082, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-10 10:48:34 UTC (rev 84083)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=13
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase=1.0.3')
+makedepends=('git' 'nasm' 'mesa')
+options=('!libtool')
+source=('v4l1_removal.patch'
+'ffmpeg_api.patch')
+md5sums=('bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_gituri=git://git.cinelerra.org/CinelerraCV.git
+_gitdir=cinelerra
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+build() {
+  msg Connecting to GIT server
+
+  if [ -d $_gitdir ] ; then
+cd $_gitdir  git pull origin
+msg The local files are updated.
+  else
+git clone $_gituri -b rel$_gitrel $_gitdir
+  fi
+
+  msg GIT checkout done or server timeout
+  msg Starting make...
+
+  rm -rf $srcdir/$_gitdir-build
+  cp -r $srcdir/$_gitdir $srcdir/$_gitdir-build
+  cd $srcdir/$_gitdir-build
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  sed -i '/\/X11R6/s///' configure.in
+
+  ./autogen.sh
+
+  if [ $CARCH = 'x86_64' ]; then
+_confit --disable-mmx
+  else
+_confit --enable-mmx
+  fi
+
+  make
+}
+
+package() {
+  cd $srcdir/$_gitdir-build
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch (from rev 
84082, cinelerra-cv/trunk/ffmpeg_api.patch)
===
--- community-staging-i686/ffmpeg_api.patch (rev 0)
+++ community-staging-i686/ffmpeg_api.patch 2013-02-10 10:48:34 UTC (rev 
84083)
@@ -0,0 +1,163 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..7cde503 100644
+--- a/cinelerra/ffmpeg.C
 b/cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-  avcodec_init();
+   avcodec_register_all();
+ 
+   CodecID id = codec_id(codec_string);
+@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame 
*frame_out) {
+ 
+   // NOTE: frame must already have data space allocated
+   
++  AVPacket pkt;
+   got_picture = 0;
+-  int length =