Deps for emulators and Miro.

63 files changed, 2 insertions, 2891 deletions

diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index cb5516d..c63627b 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.00.03 
+LinHES R6.00.04
diff --git a/abs/core-testing/glib/PKGBUILD b/abs/core-testing/glib/PKGBUILD
deleted file mode 100644
index 0f76a1e..0000000
--- a/abs/core-testing/glib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=glib
-pkgver=1.2.10
-pkgrel=7
-pkgdesc="Common C routines used by Gtk+ and other libs"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('glibc')
-options=('!libtool')
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \
-	gcc340.patch \
-	aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\
-         'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'\
-          'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\
-          'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../gcc340.patch || return 1
-  patch -Np0 -i ../aclocal-fixes.patch || return 1
-
-  #Arch64 fixes --build/host
-  ./configure --prefix=/usr #--host=i686-pc-linux-gnu
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/core-testing/glib/aclocal-fixes.patch b/abs/core-testing/glib/aclocal-fixes.patch
deleted file mode 100644
index b064074..0000000
--- a/abs/core-testing/glib/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib.m4.orig	2006-03-05 13:13:24.000000000 +0000
-+++ glib.m4	2006-03-05 13:13:35.000000000 +0000
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 
- dnl Get the cflags and libraries from the glib-config script
- dnl
diff --git a/abs/core-testing/glib/gcc340.patch b/abs/core-testing/glib/gcc340.patch
deleted file mode 100644
index 941111a..0000000
--- a/abs/core-testing/glib/gcc340.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
---- glib-1.2.10.orig/glib.h	2001-02-27 04:44:38.000000000 +0100
-+++ glib-1.2.10/glib.h	2004-05-27 15:50:32.436527848 +0200
-@@ -271,8 +271,10 @@
- 
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
-  * macros, so we can refer to them as strings unconditionally.
-+ *
-+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
-  */
--#ifdef	__GNUC__
-+#if	defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define	G_GNUC_FUNCTION		__FUNCTION__
- #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
- #else	/* !__GNUC__ */
diff --git a/abs/core-testing/gtk/PKGBUILD b/abs/core-testing/gtk/PKGBUILD
deleted file mode 100644
index 40e235c..0000000
--- a/abs/core-testing/gtk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=gtk
-pkgver=1.2.10
-pkgrel=8
-pkgdesc="The GTK+ toolkit"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('libxi' 'glib')
-options=('!libtool')
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz \
-	aclocal-fixes.patch)
-md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
-sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
-
-build() {
-  cd $startdir/src/gtk+-$pkgver
-  if [ "$CARCH" == "x86_64" ]; then
-    rm config.guess config.sub
-    ln -s /usr/share/libtool/config.guess config.guess
-    ln -s /usr/share/libtool/config.sub config.sub
-  fi
-  patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --with-xinput=xfree
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  cd $startdir/pkg/usr/include
-  ln -s gtk-1.2/gtk gtk
-}
diff --git a/abs/core-testing/gtk/aclocal-fixes.patch b/abs/core-testing/gtk/aclocal-fixes.patch
deleted file mode 100644
index dd2ffbd..0000000
--- a/abs/core-testing/gtk/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk.m4.orig	2006-03-05 13:18:09.000000000 +0000
-+++ gtk.m4	2006-03-05 13:18:20.000000000 +0000
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl
diff --git a/abs/core-testing/libmng/PKGBUILD b/abs/core-testing/libmng/PKGBUILD
deleted file mode 100644
index 34745fa..0000000
--- a/abs/core-testing/libmng/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=libmng
-pkgver=1.0.10
-pkgrel=1
-pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libmng.com/"
-license=('custom')
-depends=('zlib' 'libjpeg')
-options=(!libtool)
-source=(http://voxel.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ln -s makefiles/configure.in .
-  ln -s makefiles/Makefile.am .
-  autoreconf --force --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index 558d1ad..3cd45a8 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=16
+pkgrel=17
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
diff --git a/abs/core-testing/nasm/PKGBUILD b/abs/core-testing/nasm/PKGBUILD
deleted file mode 100644
index b17bbf9..0000000
--- a/abs/core-testing/nasm/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 18748 2008-11-08 22:48:50Z aaron $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=nasm
-pkgver=2.05.01
-pkgrel=1
-pkgdesc="80x86 assembler designed for portability and modularity"
-url="http://nasm.sourceforge.net"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/nasm/nasm-${pkgver}.tar.bz2)
-md5sums=('da4977f6d9d9b8f00527f2c62109453b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make INSTALLROOT=${pkgdir} install || return 1
-}
diff --git a/abs/core-testing/wavpack/PKGBUILD b/abs/core-testing/wavpack/PKGBUILD
deleted file mode 100644
index c0ab01a..0000000
--- a/abs/core-testing/wavpack/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 3456 2008-06-22 19:29:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Michal Hybner <dta081@gmail.com>
-pkgname=wavpack
-pkgver=4.50.0
-pkgrel=1
-pkgdesc="A completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode"
-arch=('i686' 'x86_64')
-url="http://www.wavpack.com/"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9cf854fc2e5757f6534a3a231ec6bfbc')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-mmx --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  rm -f ${startdir}/pkg/usr/lib/*.a
-}
diff --git a/abs/core-testing/xine-lib/ChangeLog b/abs/core-testing/xine-lib/ChangeLog
deleted file mode 100644
index 4e8f8a6..0000000
--- a/abs/core-testing/xine-lib/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-2008-11-27  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.15-3
-	* Added jack support (close FS#12020)
-	* Fixed several build issue (close FS#12117)
-
-2008-08-14  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.15-1
-	* Upstream update
-
-2008-07-28  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.14-2
-	* Switched to the more recent externel ffmpeg snapshot (close FS#10286)
-	* Updated win32 codecs directory location (close FS#11011)
-	* Added ChangeLog
diff --git a/abs/core-testing/xine-lib/PKGBUILD b/abs/core-testing/xine-lib/PKGBUILD
deleted file mode 100644
index 2808270..0000000
--- a/abs/core-testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 19600 2008-11-28 03:09:29Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=xine-lib
-pkgver=1.1.15
-pkgrel=3
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-url="http://xinehq.de/"
-license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'esd' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora'
-         'libxcb' 'wavpack' 'ffmpeg>=20080715')
-makedepends=('pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
-             'vcdimager' 'jack-audio-connection-kit')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-header.patch xine-imagemagick.patch ffmpeg_xine.patch)
-md5sums=('42a2b4893b7f892eb334de2fc36d49c8' '9776df4eb54d2f1f68d8268adbc3b5c2'\
-         'b139ee72700f8d118f9051e9140473f5' '45d248d45b747f049129925cbf25716d')
-sha1sums=('bcb567ea2a11c5f26b2384d5400b8466ea9048c6'
-          '121a8358d7919b2e51067412373f52848290338a'
-          '30cd75db3f0c0002f467d85466f1c404452397df'
-          'f0a0c04d5dfa3d0cd9246a1310f628deff489c12'
-	  '9f6c360291060eed24c618d010034655')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1
-  patch -p0 <../xine-header.patch || return 1
-  patch -p1 <../xine-imagemagick.patch || return 1
-  patch -p1 <../ffmpeg_xine.patch || return 1
-
-  libtoolize --force --copy || return 1
-  aclocal -I m4 || return 1
-  autoconf || return 1
-  automake --add-missing || return 1
-
-  ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \
-    --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib --with-xvmc-path=/usr/lib \
-    --with-libflac --with-wavpack \
-    --without-arts --with-jack --without-speex \
-    --disable-gnomevfs --without-pulseaudio --disable-aalib \
-    --disable-modplug --with-external-ffmpeg || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/core-testing/xine-lib/ff_audio_decoder.c b/abs/core-testing/xine-lib/ff_audio_decoder.c
deleted file mode 100644
index 423122c..0000000
--- a/abs/core-testing/xine-lib/ff_audio_decoder.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * Copyright (C) 2001-2005 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * xine audio decoder plugin using ffmpeg
- */
- 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "../../libffmpeg/ffmpeg_config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
-
-#define LOG_MODULE "ffmpeg_audio_dec"
-#define LOG_VERBOSE
-/*
-#define LOG
-*/
-
-#include "xine_internal.h"
-#include "buffer.h"
-#include "xineutils.h"
-#include "bswap.h"
-#include "ffmpeg_decoder.h"
-
-#define AUDIOBUFSIZE (64 * 1024)
-
-typedef struct {
-  audio_decoder_class_t   decoder_class;
-} ff_audio_class_t;
-
-typedef struct ff_audio_decoder_s {
-  audio_decoder_t   audio_decoder;
-
-  xine_stream_t    *stream;
-
-  int               output_open;
-  int               audio_channels;
-  int               audio_bits;
-  int               audio_sample_rate;
-
-  unsigned char    *buf;
-  int               bufsize;
-  int               size;
-
-  AVCodecContext    *context;
-  AVCodec           *codec;
-  
-  char              *decode_buffer;
-  int               decoder_ok;
-
-} ff_audio_decoder_t;
-
-
-static const ff_codec_t ff_audio_lookup[] = {
-  {BUF_AUDIO_WMAV1,      CODEC_ID_WMAV1,          "MS Windows Media Audio 1 (ffmpeg)"},
-  {BUF_AUDIO_WMAV2,      CODEC_ID_WMAV2,          "MS Windows Media Audio 2 (ffmpeg)"},
-  {BUF_AUDIO_14_4,       CODEC_ID_RA_144,         "Real 14.4 (ffmpeg)"},
-  {BUF_AUDIO_28_8,       CODEC_ID_RA_288,         "Real 28.8 (ffmpeg)"},
-  {BUF_AUDIO_MPEG,       CODEC_ID_MP3,            "MP3 (ffmpeg)"},
-  {BUF_AUDIO_MP3ADU,     CODEC_ID_MP3ADU,         "MPEG-3 adu (ffmpeg)"},
-  {BUF_AUDIO_MSADPCM,    CODEC_ID_ADPCM_MS,       "MS ADPCM (ffmpeg)"},
-  {BUF_AUDIO_QTIMAADPCM, CODEC_ID_ADPCM_IMA_QT,   "QT IMA ADPCM (ffmpeg)"},
-  {BUF_AUDIO_MSIMAADPCM, CODEC_ID_ADPCM_IMA_WAV,  "MS IMA ADPCM (ffmpeg)"},
-  {BUF_AUDIO_DK3ADPCM,   CODEC_ID_ADPCM_IMA_DK3,  "Duck DK3 ADPCM (ffmpeg)"},
-  {BUF_AUDIO_DK4ADPCM,   CODEC_ID_ADPCM_IMA_DK4,  "Duck DK4 ADPCM (ffmpeg)"},
-  {BUF_AUDIO_VQA_IMA,    CODEC_ID_ADPCM_IMA_WS,   "Westwood Studios IMA (ffmpeg)"},
-  {BUF_AUDIO_SMJPEG_IMA, CODEC_ID_ADPCM_IMA_SMJPEG, "SMJPEG IMA (ffmpeg)"},
-  {BUF_AUDIO_XA_ADPCM,   CODEC_ID_ADPCM_XA,       "CD-ROM/XA ADPCM (ffmpeg)"},
-  {BUF_AUDIO_4X_ADPCM,   CODEC_ID_ADPCM_4XM,      "4X ADPCM (ffmpeg)"},
-  {BUF_AUDIO_EA_ADPCM,   CODEC_ID_ADPCM_EA,       "Electronic Arts ADPCM (ffmpeg)"},
-  {BUF_AUDIO_MULAW,      CODEC_ID_PCM_MULAW,      "mu-law logarithmic PCM (ffmpeg)"},
-  {BUF_AUDIO_ALAW,       CODEC_ID_PCM_ALAW,       "A-law logarithmic PCM (ffmpeg)"},
-  {BUF_AUDIO_ROQ,        CODEC_ID_ROQ_DPCM,       "RoQ DPCM (ffmpeg)"},
-  {BUF_AUDIO_INTERPLAY,  CODEC_ID_INTERPLAY_DPCM, "Interplay DPCM (ffmpeg)"},
-  {BUF_AUDIO_MAC3,       CODEC_ID_MACE3,          "MACE 3:1 (ffmpeg)"},
-  {BUF_AUDIO_MAC6,       CODEC_ID_MACE6,          "MACE 6:1 (ffmpeg)"},
-  {BUF_AUDIO_XAN_DPCM,   CODEC_ID_XAN_DPCM,       "Origin Xan DPCM (ffmpeg)"},
-  {BUF_AUDIO_VMD,        CODEC_ID_VMDAUDIO,       "Sierra VMD Audio (ffmpeg)"},
-  {BUF_AUDIO_FLAC,       CODEC_ID_FLAC,           "FLAC (ffmpeg)"},
-  {BUF_AUDIO_SHORTEN,    CODEC_ID_SHORTEN,        "Shorten (ffmpeg)"},
-  {BUF_AUDIO_ALAC,       CODEC_ID_ALAC,           "ALAC (ffmpeg)"},
-  {BUF_AUDIO_QDESIGN2,   CODEC_ID_QDM2,           "QDesign (ffmpeg)"},
-  {BUF_AUDIO_COOK,       CODEC_ID_COOK,           "RealAudio Cooker (ffmpeg)"},
-  {BUF_AUDIO_TRUESPEECH, CODEC_ID_TRUESPEECH,     "TrueSpeech (ffmpeg)"},
-  {BUF_AUDIO_TTA,        CODEC_ID_TTA,            "True Audio Lossless (ffmpeg)"},
-  {BUF_AUDIO_SMACKER,    CODEC_ID_SMACKAUDIO,     "Smacker (ffmpeg)"},
-  {BUF_AUDIO_FLVADPCM,   CODEC_ID_ADPCM_SWF,	  "Flash ADPCM (ffmpeg)"},
-  {BUF_AUDIO_WAVPACK,	 CODEC_ID_WAVPACK,	  "WavPack (ffmpeg)"},
-  {BUF_AUDIO_AMR_NB,	 CODEC_ID_AMR_NB,	  "AMR narrow band (ffmpeg)"},
-  {BUF_AUDIO_AMR_WB,	 CODEC_ID_AMR_WB,	  "AMR wide band (ffmpeg)"},
-};
-
-
- static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) {
-  if (size > this->bufsize) {
-    this->bufsize = size + size / 2;
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-            _("ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"), 
-            this->bufsize);
-    this->buf = realloc( this->buf, this->bufsize );
-  }
-}
-
-static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
-
-  ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  int bytes_consumed;
-  int decode_buffer_size;
-  int offset;
-  int out;
-  audio_buffer_t *audio_buffer;
-  int bytes_to_send;
-
-  if ( (buf->decoder_flags & BUF_FLAG_HEADER) &&
-      !(buf->decoder_flags & BUF_FLAG_SPECIAL) ) {
-
-    /* accumulate init data */
-    ff_audio_ensure_buffer_size(this, this->size + buf->size);
-    memcpy(this->buf + this->size, buf->content, buf->size);
-    this->size += buf->size;
-    
-    if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-      size_t i;
-      unsigned int codec_type;
-      xine_waveformatex *audio_header;
-  
-      codec_type = buf->type & 0xFFFF0000;
-      this->codec = NULL;
-  
-      for(i = 0; i < sizeof(ff_audio_lookup)/sizeof(ff_codec_t); i++)
-        if(ff_audio_lookup[i].type == codec_type) {
-	  pthread_mutex_lock (&ffmpeg_lock);
-          this->codec = avcodec_find_decoder(ff_audio_lookup[i].id);
-	  pthread_mutex_unlock (&ffmpeg_lock);
-          _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
-                           ff_audio_lookup[i].name);
-          break;
-        }
-  
-      if (!this->codec) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-                 _("ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
-                 codec_type);
-        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-        return;
-      }
-  
-      this->context = avcodec_alloc_context();
-      
-      if(buf->decoder_flags & BUF_FLAG_STDHEADER) {
-        this->audio_sample_rate = buf->decoder_info[1];
-        this->audio_channels    = buf->decoder_info[3];
-      
-        if(this->size) {
-          audio_header = (xine_waveformatex *)this->buf;
-        
-          this->context->block_align = audio_header->nBlockAlign;
-          this->context->bit_rate    = audio_header->nAvgBytesPerSec * 8;
-      
-          if(audio_header->cbSize > 0) {
-            this->context->extradata = malloc(audio_header->cbSize);
-            this->context->extradata_size = audio_header->cbSize;
-            memcpy( this->context->extradata, 
-                    (uint8_t *)audio_header + sizeof(xine_waveformatex),
-                    audio_header->cbSize ); 
-          }
-        }
-      } else {
-        short *ptr;
-        
-        switch(codec_type) {
-          case BUF_AUDIO_14_4:
-            this->audio_sample_rate = 8000;
-            this->audio_channels    = 1;
-          
-            this->context->block_align = 240;
-            break;
-          case BUF_AUDIO_28_8:
-            this->audio_sample_rate = _X_BE_16(&this->buf[0x30]);
-            this->audio_channels    = this->buf[0x37];
-            /* this->audio_bits = buf->content[0x35] */
-  
-            this->context->block_align = _X_BE_32(&this->buf[0x18]);
-
-            this->context->extradata_size = 5*sizeof(short);
-            this->context->extradata      = malloc(this->context->extradata_size);
-  
-            ptr = (short *) this->context->extradata;
-  
-            ptr[0] = _X_BE_16(&this->buf[0x2C]); /* subpacket size */
-            ptr[1] = _X_BE_16(&this->buf[0x28]); /* subpacket height */
-            ptr[2] = _X_BE_16(&this->buf[0x16]); /* subpacket flavour */
-            ptr[3] = _X_BE_32(&this->buf[0x18]); /* coded frame size */
-            ptr[4] = 0;                          /* codec's data length  */
-
-	    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                    "ffmpeg_audio_dec: 28_8 audio channels %d bits %d sample rate %d block align %d\n",
-		     this->audio_channels, this->audio_bits, this->audio_sample_rate,
-		     this->context->block_align);
-            break;
-	  case BUF_AUDIO_COOK:
-	    {
-	      int version;
-	      int data_len;
-	      int extradata;
-
-	      version = _X_BE_16 (this->buf+4);
-	      if (version == 4) {
-		this->audio_sample_rate = _X_BE_16 (this->buf+48);
-		this->audio_bits = _X_BE_16 (this->buf+52);
-		this->audio_channels = _X_BE_16 (this->buf+54);
-		data_len = _X_BE_32 (this->buf+67);
-		extradata = 71;
-	      } else {
-		this->audio_sample_rate = _X_BE_16 (this->buf+54);
-		this->audio_bits = _X_BE_16 (this->buf+58);
-		this->audio_channels = _X_BE_16 (this->buf+60);
-		data_len = _X_BE_32 (this->buf+74);
-		extradata = 78;
-	      }
-	      this->context->block_align = _X_BE_16 (this->buf+44);
-
-              xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-	              "ffmpeg_audio_dec: cook audio channels %d bits %d sample rate %d block align %d\n",
-		      this->audio_channels, this->audio_bits, this->audio_sample_rate,
-		      this->context->block_align);
-
-              if (extradata + data_len > this->size)
-                break; /* abort early - extradata length is bad */
-
-	      this->context->extradata_size = data_len;
-	      this->context->extradata      = malloc(this->context->extradata_size +
-						     FF_INPUT_BUFFER_PADDING_SIZE);
-	      xine_fast_memcpy (this->context->extradata, this->buf + extradata,
-				this->context->extradata_size);
-	      break;
-	    }
-          default:
-            xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                    "ffmpeg_audio_dec: unknown header with buf type 0x%X\n", codec_type);
-            break;
-        }
-      }
-  
-      /* Current ffmpeg audio decoders always use 16 bits/sample 
-       * buf->decoder_info[2] can't be used as it doesn't refer to the output
-       * bits/sample for some codecs (e.g. MS ADPCM) */
-      this->audio_bits = 16;  
-  
-      this->context->bits_per_coded_sample = this->audio_bits;
-      this->context->sample_rate = this->audio_sample_rate;
-      this->context->channels    = this->audio_channels;
-      this->context->codec_id    = this->codec->id;
-      this->context->codec_type  = this->codec->type;
-      this->context->codec_tag   = _x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC);
-  
-      this->size = 0;
-  
-      this->decode_buffer = calloc(1, AVCODEC_MAX_AUDIO_FRAME_SIZE);
-  
-      return;
-    }
-  } else if ((buf->decoder_flags & BUF_FLAG_SPECIAL) &&
-             (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM)) {
-
-    this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = malloc(buf->decoder_info[2] +
-				      FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-      buf->decoder_info[2]);
-
-  } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-
-    if( !this->decoder_ok ) {
-      if ( ! this->context || ! this->codec ) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-		_("ffmpeg_audio_dec: trying to open null codec\n"));
-	_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-	return;
-      }
-
-      pthread_mutex_lock (&ffmpeg_lock);
-      if (avcodec_open (this->context, this->codec) < 0) {
-	pthread_mutex_unlock (&ffmpeg_lock);
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-                 _("ffmpeg_audio_dec: couldn't open decoder\n"));
-        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-        return;
-      }
-      pthread_mutex_unlock (&ffmpeg_lock);  
-      this->decoder_ok = 1;
-    }
-
-    if( buf->decoder_flags & BUF_FLAG_PREVIEW )
-      return;
-
-    ff_audio_ensure_buffer_size(this, this->size + buf->size);
-    xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
-    this->size += buf->size;
-
-    if (!this->output_open) {
-      if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
-        avcodec_decode_audio2 (this->context,
-                              (int16_t *)this->decode_buffer,
-                              &decode_buffer_size,
-                              &this->buf[0],
-                              this->size);
-	this->audio_bits = this->context->bits_per_coded_sample;
-	this->audio_sample_rate = this->context->sample_rate;
-	this->audio_channels = this->context->channels;
-	if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
-	  return;
-      }
-      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
-        this->stream, this->audio_bits, this->audio_sample_rate,
-        _x_ao_channels2mode(this->audio_channels));
-    }
-
-    /* if the audio still isn't open, bail */
-    if (!this->output_open)
-      return;
-
-    if (buf->decoder_flags & BUF_FLAG_FRAME_END)  { /* time to decode a frame */
-
-      offset = 0;
-      while (this->size>0) {
-        decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-        bytes_consumed = avcodec_decode_audio2 (this->context, 
-                                               (int16_t *)this->decode_buffer,
-                                               &decode_buffer_size, 
-                                               &this->buf[offset],
-                                               this->size);
-
-        if (bytes_consumed<0) {
-          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                   "ffmpeg_audio_dec: error decompressing audio frame\n");
-          this->size=0;
-          return;
-        } else if (bytes_consumed == 0 && decode_buffer_size == 0) {
-          if (offset)
-            memmove(this->buf, &this->buf[offset], this->size);
-          return;
-        }
-
-        /* dispatch the decoded audio */
-        out = 0;
-        while (out < decode_buffer_size) {
-          audio_buffer = 
-            this->stream->audio_out->get_buffer (this->stream->audio_out);
-          if (audio_buffer->mem_size == 0) {
-            xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                     "ffmpeg_audio_dec: Help! Allocated audio buffer with nothing in it!\n");
-            return;
-          }
-
-          if ((decode_buffer_size - out) > audio_buffer->mem_size)
-            bytes_to_send = audio_buffer->mem_size;
-          else
-            bytes_to_send = decode_buffer_size - out;
-
-          /* fill up this buffer */
-          xine_fast_memcpy(audio_buffer->mem, &this->decode_buffer[out],
-			   bytes_to_send);
-          /* byte count / 2 (bytes / sample) / channels */
-          audio_buffer->num_frames = bytes_to_send / 2 / this->audio_channels;
-
-          audio_buffer->vpts = buf->pts;
-          buf->pts = 0;  /* only first buffer gets the real pts */
-          this->stream->audio_out->put_buffer (this->stream->audio_out,
-            audio_buffer, this->stream);
-
-          out += bytes_to_send;
-        }
-
-        this->size -= bytes_consumed;
-        offset += bytes_consumed;
-      }
-
-      /* reset internal accumulation buffer */
-      this->size = 0;
-    }
-  }
-}
-
-static void ff_audio_reset (audio_decoder_t *this_gen) {
-  ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  
-  this->size = 0;
-
-  /* try to reset the wma decoder */
-  if( this->context && this->decoder_ok ) {
-    pthread_mutex_lock (&ffmpeg_lock);
-    avcodec_close (this->context);
-    if (avcodec_open (this->context, this->codec) < 0)
-      this->decoder_ok = 0;
-    pthread_mutex_unlock (&ffmpeg_lock);
-  }
-}
-
-static void ff_audio_discontinuity (audio_decoder_t *this_gen) {
-}
-
-static void ff_audio_dispose (audio_decoder_t *this_gen) {
-
-  ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  
-  if( this->context && this->decoder_ok ) {
-    pthread_mutex_lock (&ffmpeg_lock);
-    avcodec_close (this->context);
-    pthread_mutex_unlock (&ffmpeg_lock);
-  }
-
-  if (this->output_open)
-    this->stream->audio_out->close (this->stream->audio_out, this->stream);
-  this->output_open = 0;
-
-  free(this->buf);
-  free(this->decode_buffer);
-
-  if(this->context && this->context->extradata)
-    free(this->context->extradata);
-
-  if(this->context)
-    free(this->context);
-
-  free (this_gen);
-}
-
-static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) {
-
-  ff_audio_decoder_t *this ;
-
-  this = calloc(1, sizeof (ff_audio_decoder_t));
-
-  this->audio_decoder.decode_data         = ff_audio_decode_data;
-  this->audio_decoder.reset               = ff_audio_reset;
-  this->audio_decoder.discontinuity       = ff_audio_discontinuity;
-  this->audio_decoder.dispose             = ff_audio_dispose;
-
-  this->output_open = 0;
-  this->audio_channels = 0;
-  this->stream = stream;
-  this->buf = NULL;
-  this->size = 0;
-  this->bufsize = 0;
-  this->decoder_ok = 0;
-  
-  ff_audio_ensure_buffer_size(this, AUDIOBUFSIZE);
-
-  return &this->audio_decoder;
-}
-
-static char *ff_audio_get_identifier (audio_decoder_class_t *this) {
-  return "ffmpeg audio";
-}
-
-static char *ff_audio_get_description (audio_decoder_class_t *this) {
-  return "ffmpeg based audio decoder plugin";
-}
-
-static void ff_audio_dispose_class (audio_decoder_class_t *this) {
-  free (this);
-}
-
-void *init_audio_plugin (xine_t *xine, void *data) {
-
-  ff_audio_class_t *this ;
-
-  this = calloc(1, sizeof (ff_audio_class_t));
-
-  this->decoder_class.open_plugin     = ff_audio_open_plugin;
-  this->decoder_class.get_identifier  = ff_audio_get_identifier;
-  this->decoder_class.get_description = ff_audio_get_description;
-  this->decoder_class.dispose         = ff_audio_dispose_class;
-
-  pthread_once( &once_control, init_once_routine );
-
-  return this;
-}
-
-static uint32_t supported_audio_types[] = { 
-  #ifdef CONFIG_WMAV1_DECODER
-  BUF_AUDIO_WMAV1,
-  #endif
-  #ifdef CONFIG_WMAV2_DECODER
-  BUF_AUDIO_WMAV2,
-  #endif
-  #ifdef CONFIG_RA_144_DECODER
-  BUF_AUDIO_14_4,
-  #endif
-  #ifdef CONFIG_RA_288_DECODER
-  BUF_AUDIO_28_8,
-  #endif
-  #ifdef CONFIG_MP3_DECODER
-  BUF_AUDIO_MPEG,
-  #endif
-  #ifdef CONFIG_ADPCM_MS_DECODER
-  BUF_AUDIO_MSADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_QT_DECODER
-  BUF_AUDIO_QTIMAADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_WAV_DECODER
-  BUF_AUDIO_MSIMAADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_DK3_DECODER
-  BUF_AUDIO_DK3ADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_DK4_DECODER
-  BUF_AUDIO_DK4ADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_WS_DECODER
-  BUF_AUDIO_VQA_IMA,
-  #endif
-  #ifdef CONFIG_ADPCM_IMA_SMJPEG_DECODER
-  BUF_AUDIO_SMJPEG_IMA,
-  #endif
-  #ifdef CONFIG_ADPCM_XA_DECODER
-  BUF_AUDIO_XA_ADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_4XM_DECODER
-  BUF_AUDIO_4X_ADPCM,
-  #endif
-  #ifdef CONFIG_ADPCM_EA_DECODER
-  BUF_AUDIO_EA_ADPCM,
-  #endif
-  #ifdef CONFIG_PCM_MULAW_DECODER
-  BUF_AUDIO_MULAW,
-  #endif
-  #ifdef CONFIG_PCM_ALAW_DECODER
-  BUF_AUDIO_ALAW,
-  #endif
-  #ifdef CONFIG_ROQ_DPCM_DECODER
-  BUF_AUDIO_ROQ,
-  #endif
-  #ifdef CONFIG_INTERPLAY_DPCM_DECODER
-  BUF_AUDIO_INTERPLAY,
-  #endif
-  #ifdef CONFIG_MACE3_DECODER
-  BUF_AUDIO_MAC3,
-  #endif
-  #ifdef CONFIG_MACE6_DECODER
-  BUF_AUDIO_MAC6,
-  #endif
-  #ifdef CONFIG_XAN_DPCM_DECODER
-  BUF_AUDIO_XAN_DPCM,
-  #endif
-  #ifdef CONFIG_VMDAUDIO_DECODER
-  BUF_AUDIO_VMD,
-  #endif
-  #ifdef CONFIG_FLAC_DECODER
-  BUF_AUDIO_FLAC,
-  #endif
-  #ifdef CONFIG_SHORTEN_DECODER
-  BUF_AUDIO_SHORTEN,
-  #endif
-  #ifdef CONFIG_ALAC_DECODER
-  BUF_AUDIO_ALAC,
-  #endif
-  #ifdef CONFIG_QDM2_DECODER
-  BUF_AUDIO_QDESIGN2,
-  #endif
-  #ifdef CONFIG_COOK_DECODER
-  BUF_AUDIO_COOK,
-  #endif
-  #ifdef CONFIG_TRUESPEECH_DECODER
-  BUF_AUDIO_TRUESPEECH,
-  #endif
-  #ifdef CONFIG_TTA_DECODER
-  BUF_AUDIO_TTA,
-  #endif
-  #ifdef CONFIG_SMACKAUDIO_DECODER
-  BUF_AUDIO_SMACKER,
-  #endif
-  #ifdef CONFIG_ADPCM_SWF_DECODER
-  BUF_AUDIO_FLVADPCM,
-  #endif
-  #ifdef CONFIG_WAVPACK_DECODER
-  BUF_AUDIO_WAVPACK,
-  #endif
-  #ifdef CONFIG_AMR_NB_DECODER
-  BUF_AUDIO_AMR_NB,
-  #endif
-  #ifdef CONFIG_AMR_WB_DECODER
-  BUF_AUDIO_AMR_WB,
-  #endif
-  0
-};
-
-decoder_info_t dec_info_ffmpeg_audio = {
-  supported_audio_types,   /* supported types */
-  7                        /* priority        */
-};
diff --git a/abs/core-testing/xine-lib/ff_video_decoder.c b/abs/core-testing/xine-lib/ff_video_decoder.c
deleted file mode 100644
index 2a22857..0000000
--- a/abs/core-testing/xine-lib/ff_video_decoder.c
+++ /dev/null
@@ -1,1926 +0,0 @@
-/*
- * Copyright (C) 2001-2007 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * xine video decoder plugin using ffmpeg
- */
- 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "../../libffmpeg/ffmpeg_config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
-#include <assert.h>
-
-#define LOG_MODULE "ffmpeg_video_dec"
-#define LOG_VERBOSE
-/*
-#define LOG
-*/
-#include "xine_internal.h"
-#include "bswap.h"
-#include "buffer.h"
-#include "xineutils.h"
-#include "ffmpeg_decoder.h"
-#include "ff_mpeg_parser.h"
-
-#ifdef HAVE_FFMPEG_AVUTIL_H
-#  include <postprocess.h>
-#else
-#  include <libpostproc/postprocess.h>
-#endif
-
-#define VIDEOBUFSIZE        (128*1024)
-#define SLICE_BUFFER_SIZE   (1194*1024)
-
-#define SLICE_OFFSET_SIZE   128
-
-#define ENABLE_DIRECT_RENDERING
-
-typedef struct ff_video_decoder_s ff_video_decoder_t;
-
-typedef struct ff_video_class_s {
-  video_decoder_class_t   decoder_class;
-
-  int                     pp_quality;
-  int                     thread_count;
-  int8_t                  skip_loop_filter_enum;
-  int8_t                  choose_speed_over_accuracy;
-  
-  xine_t                 *xine;
-} ff_video_class_t;
-
-struct ff_video_decoder_s {
-  video_decoder_t   video_decoder;
-
-  ff_video_class_t *class;
-
-  xine_stream_t    *stream;
-  int64_t           pts;
-  int               video_step;
-
-  uint8_t           decoder_ok:1;
-  uint8_t           decoder_init_mode:1;
-  uint8_t           is_mpeg12:1;
-  uint8_t           pp_available:1;
-  uint8_t           yuv_init:1;
-  uint8_t           is_direct_rendering_disabled:1;
-  uint8_t           cs_convert_init:1;
-  uint8_t           assume_bad_field_picture:1;
-
-  xine_bmiheader    bih;
-  unsigned char    *buf;
-  int               bufsize;
-  int               size;
-  int               skipframes;
-  
-  int               slice_offset_size;
-
-  AVFrame          *av_frame;
-  AVCodecContext   *context;
-  AVCodec          *codec;
-  
-  int               pp_quality;
-  int               pp_flags;
-  pp_context_t     *pp_context;
-  pp_mode_t        *pp_mode;
-
-  /* mpeg-es parsing */
-  mpeg_parser_t    *mpeg_parser;
-
-  double            aspect_ratio;
-  int               aspect_ratio_prio;
-  int               frame_flags;
-  int               crop_right, crop_bottom;
-  
-  int               output_format;
-
-  xine_list_t       *dr1_frames;
-
-  yuv_planes_t      yuv;
-
-  AVPaletteControl  palette_control;
-
-#ifdef LOG
-  enum PixelFormat  debug_fmt;
-#endif
-};
-
-
-static void set_stream_info(ff_video_decoder_t *this) {
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH,  this->bih.biWidth);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight);
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO,  this->aspect_ratio * 10000);
-}
-
-#ifdef ENABLE_DIRECT_RENDERING
-/* called from ffmpeg to do direct rendering method 1 */
-static int get_buffer(AVCodecContext *context, AVFrame *av_frame){
-  ff_video_decoder_t *this = (ff_video_decoder_t *)context->opaque;
-  vo_frame_t *img;
-  int width  = context->width;
-  int height = context->height;
-        
-  if (!this->bih.biWidth || !this->bih.biHeight) {
-    this->bih.biWidth = width;
-    this->bih.biHeight = height;
-
-    if (this->aspect_ratio_prio == 0) {
-      this->aspect_ratio = (double)width / (double)height;
-      this->aspect_ratio_prio = 1;
-      lprintf("default aspect ratio: %f\n", this->aspect_ratio);
-      set_stream_info(this);
-    }
-  }
-  
-  avcodec_align_dimensions(context, &width, &height);
-
-  if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) {
-    if (!this->is_direct_rendering_disabled) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-              _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"));
-      this->is_direct_rendering_disabled = 1;
-    }
-
-    /* FIXME: why should i have to do that ? */
-    av_frame->data[0]= NULL;
-    av_frame->data[1]= NULL;
-    av_frame->data[2]= NULL;
-    return avcodec_default_get_buffer(context, av_frame);
-  }
-  
-  if((width != this->bih.biWidth) || (height != this->bih.biHeight)) {
-    if(this->stream->video_out->get_capabilities(this->stream->video_out) & VO_CAP_CROP) {
-      this->crop_right = width - this->bih.biWidth;
-      this->crop_bottom = height - this->bih.biHeight;
-    } else {
-      if (!this->is_direct_rendering_disabled) {
-        xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-                _("ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"));
-        this->is_direct_rendering_disabled = 1;
-      }
-      /* FIXME: why should i have to do that ? */
-      av_frame->data[0]= NULL;
-      av_frame->data[1]= NULL;
-      av_frame->data[2]= NULL;
-      return avcodec_default_get_buffer(context, av_frame);
-    }
-  }
-
-  img = this->stream->video_out->get_frame (this->stream->video_out,
-                                            width,
-                                            height,
-                                            this->aspect_ratio, 
-                                            this->output_format,
-                                            VO_BOTH_FIELDS|this->frame_flags);
-
-  av_frame->opaque = img;
-
-  av_frame->data[0]= img->base[0];
-  av_frame->data[1]= img->base[1];
-  av_frame->data[2]= img->base[2];
-
-  av_frame->linesize[0] = img->pitches[0];
-  av_frame->linesize[1] = img->pitches[1];
-  av_frame->linesize[2] = img->pitches[2];
-
-  /* We should really keep track of the ages of xine frames (see
-   * avcodec_default_get_buffer in libavcodec/utils.c)
-   * For the moment tell ffmpeg that every frame is new (age = bignumber) */
-  av_frame->age = 256*256*256*64;
-
-  av_frame->type= FF_BUFFER_TYPE_USER;
-
-  xine_list_push_back(this->dr1_frames, av_frame);
-
-  return 0;
-}
-
-static void release_buffer(struct AVCodecContext *context, AVFrame *av_frame){
-  ff_video_decoder_t *this = (ff_video_decoder_t *)context->opaque;
-
-  if (av_frame->type == FF_BUFFER_TYPE_USER) {
-    if ( av_frame->opaque ) {
-      vo_frame_t *img = (vo_frame_t *)av_frame->opaque;
-
-      img->free(img);
-    }
-
-    xine_list_iterator_t it;
-    
-    it = xine_list_find(this->dr1_frames, av_frame);
-    assert(it);
-    if( it != NULL )
-      xine_list_remove(this->dr1_frames, it);
-  } else {
-    avcodec_default_release_buffer(context, av_frame);
-  }
-
-  av_frame->opaque = NULL;
-  av_frame->data[0]= NULL;
-  av_frame->data[1]= NULL;
-  av_frame->data[2]= NULL;
-}
-#endif
-
-static const ff_codec_t ff_video_lookup[] = {
-  {BUF_VIDEO_MSMPEG4_V1,  CODEC_ID_MSMPEG4V1, "Microsoft MPEG-4 v1 (ffmpeg)"},
-  {BUF_VIDEO_MSMPEG4_V2,  CODEC_ID_MSMPEG4V2, "Microsoft MPEG-4 v2 (ffmpeg)"},
-  {BUF_VIDEO_MSMPEG4_V3,  CODEC_ID_MSMPEG4V3, "Microsoft MPEG-4 v3 (ffmpeg)"},
-  {BUF_VIDEO_WMV7,        CODEC_ID_WMV1,      "MS Windows Media Video 7 (ffmpeg)"},
-  {BUF_VIDEO_WMV8,        CODEC_ID_WMV2,      "MS Windows Media Video 8 (ffmpeg)"},
-  {BUF_VIDEO_WMV9,        CODEC_ID_WMV3,      "MS Windows Media Video 9 (ffmpeg)"},
-  {BUF_VIDEO_VC1,         CODEC_ID_VC1,       "MS Windows Media Video VC-1 (ffmpeg)"},
-  {BUF_VIDEO_MPEG4,       CODEC_ID_MPEG4,     "ISO MPEG-4 (ffmpeg)"},
-  {BUF_VIDEO_XVID,        CODEC_ID_MPEG4,     "ISO MPEG-4 (XviD, ffmpeg)"},
-  {BUF_VIDEO_DIVX5,       CODEC_ID_MPEG4,     "ISO MPEG-4 (DivX5, ffmpeg)"},
-  {BUF_VIDEO_3IVX,        CODEC_ID_MPEG4,     "ISO MPEG-4 (3ivx, ffmpeg)"},
-  {BUF_VIDEO_JPEG,        CODEC_ID_MJPEG,     "Motion JPEG (ffmpeg)"},
-  {BUF_VIDEO_MJPEG,       CODEC_ID_MJPEG,     "Motion JPEG (ffmpeg)"},
-  {BUF_VIDEO_MJPEG_B,     CODEC_ID_MJPEGB,    "Motion JPEG B (ffmpeg)"},
-  {BUF_VIDEO_I263,        CODEC_ID_H263I,     "ITU H.263 (ffmpeg)"},
-  {BUF_VIDEO_H263,        CODEC_ID_H263,      "H.263 (ffmpeg)"},
-  {BUF_VIDEO_RV10,        CODEC_ID_RV10,      "Real Video 1.0 (ffmpeg)"},
-  {BUF_VIDEO_RV20,        CODEC_ID_RV20,      "Real Video 2.0 (ffmpeg)"},
-  {BUF_VIDEO_IV31,        CODEC_ID_INDEO3,    "Indeo Video 3.1 (ffmpeg)"},
-  {BUF_VIDEO_IV32,        CODEC_ID_INDEO3,    "Indeo Video 3.2 (ffmpeg)"},
-  {BUF_VIDEO_SORENSON_V1, CODEC_ID_SVQ1,      "Sorenson Video 1 (ffmpeg)"},
-  {BUF_VIDEO_SORENSON_V3, CODEC_ID_SVQ3,      "Sorenson Video 3 (ffmpeg)"},
-  {BUF_VIDEO_DV,          CODEC_ID_DVVIDEO,   "DV (ffmpeg)"},
-  {BUF_VIDEO_HUFFYUV,     CODEC_ID_HUFFYUV,   "HuffYUV (ffmpeg)"},
-  {BUF_VIDEO_VP31,        CODEC_ID_VP3,       "On2 VP3.1 (ffmpeg)"},
-  {BUF_VIDEO_VP5,         CODEC_ID_VP5,       "On2 VP5 (ffmpeg)"},
-  {BUF_VIDEO_VP6,         CODEC_ID_VP6,       "On2 VP6 (ffmpeg)"},
-  {BUF_VIDEO_VP6F,        CODEC_ID_VP6F,      "On2 VP6 (ffmpeg)"},
-  {BUF_VIDEO_4XM,         CODEC_ID_4XM,       "4X Video (ffmpeg)"},
-  {BUF_VIDEO_CINEPAK,     CODEC_ID_CINEPAK,   "Cinepak (ffmpeg)"},
-  {BUF_VIDEO_MSVC,        CODEC_ID_MSVIDEO1,  "Microsoft Video 1 (ffmpeg)"},
-  {BUF_VIDEO_MSRLE,       CODEC_ID_MSRLE,     "Microsoft RLE (ffmpeg)"},
-  {BUF_VIDEO_RPZA,        CODEC_ID_RPZA,      "Apple Quicktime Video/RPZA (ffmpeg)"},
-  {BUF_VIDEO_CYUV,        CODEC_ID_CYUV,      "Creative YUV (ffmpeg)"},
-  {BUF_VIDEO_ROQ,         CODEC_ID_ROQ,       "Id Software RoQ (ffmpeg)"},
-  {BUF_VIDEO_IDCIN,       CODEC_ID_IDCIN,     "Id Software CIN (ffmpeg)"},
-  {BUF_VIDEO_WC3,         CODEC_ID_XAN_WC3,   "Xan (ffmpeg)"},
-  {BUF_VIDEO_VQA,         CODEC_ID_WS_VQA,    "Westwood Studios VQA (ffmpeg)"},
-  {BUF_VIDEO_INTERPLAY,   CODEC_ID_INTERPLAY_VIDEO, "Interplay MVE (ffmpeg)"},
-  {BUF_VIDEO_FLI,         CODEC_ID_FLIC,      "FLIC Video (ffmpeg)"},
-  {BUF_VIDEO_8BPS,        CODEC_ID_8BPS,      "Planar RGB (ffmpeg)"},
-  {BUF_VIDEO_SMC,         CODEC_ID_SMC,       "Apple Quicktime Graphics/SMC (ffmpeg)"},
-  {BUF_VIDEO_DUCKTM1,     CODEC_ID_TRUEMOTION1,"Duck TrueMotion v1 (ffmpeg)"},
-  {BUF_VIDEO_DUCKTM2,     CODEC_ID_TRUEMOTION2,"Duck TrueMotion v2 (ffmpeg)"},
-  {BUF_VIDEO_VMD,         CODEC_ID_VMDVIDEO,   "Sierra VMD Video (ffmpeg)"},
-  {BUF_VIDEO_ZLIB,        CODEC_ID_ZLIB,       "ZLIB Video (ffmpeg)"},
-  {BUF_VIDEO_MSZH,        CODEC_ID_MSZH,       "MSZH Video (ffmpeg)"},
-  {BUF_VIDEO_ASV1,        CODEC_ID_ASV1,       "ASV v1 Video (ffmpeg)"},
-  {BUF_VIDEO_ASV2,        CODEC_ID_ASV2,       "ASV v2 Video (ffmpeg)"},
-  {BUF_VIDEO_ATIVCR1,     CODEC_ID_VCR1,       "ATI VCR-1 (ffmpeg)"},
-  {BUF_VIDEO_FLV1,        CODEC_ID_FLV1,       "Flash Video (ffmpeg)"},
-  {BUF_VIDEO_QTRLE,       CODEC_ID_QTRLE,      "Apple Quicktime Animation/RLE (ffmpeg)"},
-  {BUF_VIDEO_H264,        CODEC_ID_H264,       "H.264/AVC (ffmpeg)"},
-  {BUF_VIDEO_H261,        CODEC_ID_H261,       "H.261 (ffmpeg)"},
-  {BUF_VIDEO_AASC,        CODEC_ID_AASC,       "Autodesk Video (ffmpeg)"},
-  {BUF_VIDEO_LOCO,        CODEC_ID_LOCO,       "LOCO (ffmpeg)"},
-  {BUF_VIDEO_QDRW,        CODEC_ID_QDRAW,      "QuickDraw (ffmpeg)"},
-  {BUF_VIDEO_QPEG,        CODEC_ID_QPEG,       "Q-Team QPEG (ffmpeg)"},
-  {BUF_VIDEO_TSCC,        CODEC_ID_TSCC,       "TechSmith Video (ffmpeg)"},
-  {BUF_VIDEO_ULTI,        CODEC_ID_ULTI,       "IBM UltiMotion (ffmpeg)"},
-  {BUF_VIDEO_WNV1,        CODEC_ID_WNV1,       "Winnow Video (ffmpeg)"},
-  {BUF_VIDEO_XL,          CODEC_ID_VIXL,       "Miro/Pinnacle VideoXL (ffmpeg)"},
-  {BUF_VIDEO_RT21,        CODEC_ID_INDEO2,     "Indeo/RealTime 2 (ffmpeg)"},
-  {BUF_VIDEO_FPS1,        CODEC_ID_FRAPS,      "Fraps (ffmpeg)"},
-  {BUF_VIDEO_MPEG,        CODEC_ID_MPEG1VIDEO, "MPEG 1/2 (ffmpeg)"},
-  {BUF_VIDEO_CSCD,        CODEC_ID_CSCD,       "CamStudio (ffmpeg)"},
-  {BUF_VIDEO_AVS,         CODEC_ID_AVS,        "AVS (ffmpeg)"},
-  {BUF_VIDEO_ALGMM,       CODEC_ID_MMVIDEO,    "American Laser Games MM (ffmpeg)"},
-  {BUF_VIDEO_ZMBV,        CODEC_ID_ZMBV,       "Zip Motion Blocks Video (ffmpeg)"},
-  {BUF_VIDEO_SMACKER,     CODEC_ID_SMACKVIDEO, "Smacker (ffmpeg)"},
-  {BUF_VIDEO_NUV,         CODEC_ID_NUV,        "NuppelVideo (ffmpeg)"},
-  {BUF_VIDEO_KMVC,        CODEC_ID_KMVC,       "Karl Morton's Video Codec (ffmpeg)"},
-  {BUF_VIDEO_FLASHSV,     CODEC_ID_FLASHSV,    "Flash Screen Video (ffmpeg)"},
-  {BUF_VIDEO_CAVS,        CODEC_ID_CAVS,       "Chinese AVS (ffmpeg)"},
-  {BUF_VIDEO_VMNC,        CODEC_ID_VMNC,       "VMware Screen Codec (ffmpeg)"},
-  {BUF_VIDEO_THEORA_RAW,  CODEC_ID_THEORA,     "Theora (ffmpeg)"},
-  {BUF_VIDEO_SNOW,        CODEC_ID_SNOW,       "Snow (ffmpeg)"},
-};
-
-static const char *const skip_loop_filter_enum_names[] = {
-  "default", /* AVDISCARD_DEFAULT */
-  "none",    /* AVDISCARD_NONE */
-  "nonref",  /* AVDISCARD_NONREF */
-  "bidir",   /* AVDISCARD_BIDIR */
-  "nonkey",  /* AVDISCARD_NONKEY */
-  "all",     /* AVDISCARD_ALL */
-  NULL
-};
-
-static const int skip_loop_filter_enum_values[] = {
-  AVDISCARD_DEFAULT,
-  AVDISCARD_NONE,
-  AVDISCARD_NONREF,
-  AVDISCARD_BIDIR,
-  AVDISCARD_NONKEY,
-  AVDISCARD_ALL
-};
-
-static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) {
-  size_t i;
-
-  /* find the decoder */
-  this->codec = NULL;
-
-  for(i = 0; i < sizeof(ff_video_lookup)/sizeof(ff_codec_t); i++)
-    if(ff_video_lookup[i].type == codec_type) {
-      pthread_mutex_lock(&ffmpeg_lock);
-      this->codec = avcodec_find_decoder(ff_video_lookup[i].id);
-      pthread_mutex_unlock(&ffmpeg_lock);
-      _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
-                            ff_video_lookup[i].name);
-      break;
-    }
-
-  if (!this->codec) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-            _("ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
-            codec_type);
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0);
-    return;
-  }
-
-  lprintf("lavc decoder found\n");
-
-  /* force (width % 8 == 0), otherwise there will be 
-   * display problems with Xv. 
-   */ 
-  this->bih.biWidth = (this->bih.biWidth + 1) & (~1);
-
-  this->context->width = this->bih.biWidth;
-  this->context->height = this->bih.biHeight;
-  this->context->stream_codec_tag = this->context->codec_tag = 
-    _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC);
-
-
-  /* Some codecs (eg rv10) copy flags in init so it's necessary to set
-   * this flag here in case we are going to use direct rendering */
-  if(this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264) {
-    this->context->flags |= CODEC_FLAG_EMU_EDGE;
-  }
- 
-  if (this->class->choose_speed_over_accuracy)
-    this->context->flags2 |= CODEC_FLAG2_FAST;
-
-  pthread_mutex_lock(&ffmpeg_lock);
-  if (avcodec_open (this->context, this->codec) < 0) {
-    pthread_mutex_unlock(&ffmpeg_lock);
-    xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
-             _("ffmpeg_video_dec: couldn't open decoder\n"));
-    free(this->context);
-    this->context = NULL;
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0);
-    return;
-  }
-
-  if (this->class->thread_count > 1) {
-    avcodec_thread_init(this->context, this->class->thread_count);
-    this->context->thread_count = this->class->thread_count;
-  }
-
-  this->context->skip_loop_filter = skip_loop_filter_enum_values[this->class->skip_loop_filter_enum];
-
-  pthread_mutex_unlock(&ffmpeg_lock);
-
-  lprintf("lavc decoder opened\n");
-
-  this->decoder_ok = 1;
-
-  if ((codec_type != BUF_VIDEO_MPEG) &&
-      (codec_type != BUF_VIDEO_DV)) {
-
-    if (!this->bih.biWidth || !this->bih.biHeight) {
-      this->bih.biWidth = this->context->width;
-      this->bih.biHeight = this->context->height;
-    }
-
-
-    set_stream_info(this);
-  }
-
-  (this->stream->video_out->open) (this->stream->video_out, this->stream);
-
-  this->skipframes = 0;
-  
-  /* enable direct rendering by default */
-  this->output_format = XINE_IMGFMT_YV12;
-#ifdef ENABLE_DIRECT_RENDERING
-  if( this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264 ) {
-    this->context->get_buffer = get_buffer;
-    this->context->release_buffer = release_buffer;
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-	    _("ffmpeg_video_dec: direct rendering enabled\n"));
-  }
-#endif
-
-  /* flag for interlaced streams */
-  this->frame_flags = 0;
-  /* FIXME: which codecs can be interlaced?
-      FIXME: check interlaced DCT and other codec specific info. */
-  switch( codec_type ) {
-    case BUF_VIDEO_DV:
-      this->frame_flags |= VO_INTERLACED_FLAG;
-      break;
-    case BUF_VIDEO_MPEG:
-      this->frame_flags |= VO_INTERLACED_FLAG;
-      break;
-    case BUF_VIDEO_MJPEG:
-      this->frame_flags |= VO_INTERLACED_FLAG;
-      break;
-    case BUF_VIDEO_HUFFYUV:
-      this->frame_flags |= VO_INTERLACED_FLAG;
-      break;
-    case BUF_VIDEO_H264:
-      this->frame_flags |= VO_INTERLACED_FLAG;
-      break;
-  }
-
-}
-
-static void choose_speed_over_accuracy_cb(void *user_data, xine_cfg_entry_t *entry) {
-  ff_video_class_t   *class = (ff_video_class_t *) user_data;
-  
-  class->choose_speed_over_accuracy = entry->num_value;
-}
-
-static void skip_loop_filter_enum_cb(void *user_data, xine_cfg_entry_t *entry) {
-  ff_video_class_t   *class = (ff_video_class_t *) user_data;
-  
-  class->skip_loop_filter_enum = entry->num_value;
-}
-
-static void thread_count_cb(void *user_data, xine_cfg_entry_t *entry) {
-  ff_video_class_t   *class = (ff_video_class_t *) user_data;
-  
-  class->thread_count = entry->num_value;
-}
-
-static void pp_quality_cb(void *user_data, xine_cfg_entry_t *entry) {
-  ff_video_class_t   *class = (ff_video_class_t *) user_data;
-  
-  class->pp_quality = entry->num_value;
-}
-
-static void pp_change_quality (ff_video_decoder_t *this) {
-  this->pp_quality = this->class->pp_quality;
-
-  if(this->pp_available && this->pp_quality) {
-    if(!this->pp_context && this->context)
-      this->pp_context = pp_get_context(this->context->width, this->context->height,
-                                        this->pp_flags);
-    if(this->pp_mode)
-      pp_free_mode(this->pp_mode);
-      
-    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", 
-                                                    this->pp_quality);
-  } else {
-    if(this->pp_mode) {
-      pp_free_mode(this->pp_mode);
-      this->pp_mode = NULL;
-    }
-    
-    if(this->pp_context) {
-      pp_free_context(this->pp_context);
-      this->pp_context = NULL;
-    }
-  }
-}
-
-static void init_postprocess (ff_video_decoder_t *this) {
-  uint32_t cpu_caps;
-
-  /* Allow post processing on mpeg-4 (based) codecs */
-  switch(this->codec->id) {
-    case CODEC_ID_MPEG4:
-    case CODEC_ID_MSMPEG4V1:
-    case CODEC_ID_MSMPEG4V2:
-    case CODEC_ID_MSMPEG4V3:
-    case CODEC_ID_WMV1:
-    case CODEC_ID_WMV2:
-      this->pp_available = 1;
-      break;
-    default:
-      this->pp_available = 0;
-      break;
-  }
-  
-  /* Detect what cpu accel we have */
-  cpu_caps = xine_mm_accel();
-  this->pp_flags = PP_FORMAT_420;
- 
-  if(cpu_caps & MM_ACCEL_X86_MMX)
-    this->pp_flags |= PP_CPU_CAPS_MMX;
-    
-  if(cpu_caps & MM_ACCEL_X86_MMXEXT)
-    this->pp_flags |= PP_CPU_CAPS_MMX2;
-  
-  if(cpu_caps & MM_ACCEL_X86_3DNOW)  
-    this->pp_flags |= PP_CPU_CAPS_3DNOW;
-   
-  /* Set level */
-  pp_change_quality(this);    
-}
-
-static int ff_handle_mpeg_sequence(ff_video_decoder_t *this, mpeg_parser_t *parser) {
-
-  /*
-   * init codec
-   */
-  if (this->decoder_init_mode) {
-    _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, 
-                          "mpeg-1 (ffmpeg)");
-
-    init_video_codec (this, BUF_VIDEO_MPEG);
-    this->decoder_init_mode = 0;
-  }
-  
-  /* frame format change */
-  if ((parser->width != this->bih.biWidth) ||
-      (parser->height != this->bih.biHeight) ||
-      (parser->frame_aspect_ratio != this->aspect_ratio)) {
-    xine_event_t event;
-    xine_format_change_data_t data;
-
-    this->bih.biWidth  = parser->width;
-    this->bih.biHeight = parser->height;
-    this->aspect_ratio = parser->frame_aspect_ratio;
-    this->aspect_ratio_prio = 2;
-    lprintf("mpeg seq aspect ratio: %f\n", this->aspect_ratio);
-    set_stream_info(this);
-
-    event.type = XINE_EVENT_FRAME_FORMAT_CHANGE;
-    event.stream = this->stream;
-    event.data = &data;
-    event.data_length = sizeof(data);
-    data.width = this->bih.biWidth;
-    data.height = this->bih.biHeight;
-    data.aspect = this->aspect_ratio;
-    data.pan_scan = 0;
-    xine_event_send(this->stream, &event);
-  }
-  this->video_step = this->mpeg_parser->frame_duration;
-  
-  return 1;
-}
-
-static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) {
-  int         y;
-  uint8_t    *dy, *du, *dv, *sy, *su, *sv;
-
-#ifdef LOG
-  if (this->debug_fmt != this->context->pix_fmt)
-    printf ("frame format == %08x\n", this->debug_fmt = this->context->pix_fmt);
-#endif
-
-  dy = img->base[0];
-  du = img->base[1];
-  dv = img->base[2];
-  sy = this->av_frame->data[0];
-  su = this->av_frame->data[1];
-  sv = this->av_frame->data[2];
-
-  if (this->context->pix_fmt == PIX_FMT_YUV410P) {
-
-    yuv9_to_yv12(
-     /* Y */
-      this->av_frame->data[0],
-      this->av_frame->linesize[0],
-      img->base[0],
-      img->pitches[0],
-     /* U */
-      this->av_frame->data[1],
-      this->av_frame->linesize[1],
-      img->base[1],
-      img->pitches[1],
-     /* V */
-      this->av_frame->data[2],
-      this->av_frame->linesize[2],
-      img->base[2],
-      img->pitches[2],
-     /* width x height */
-      img->width,
-      img->height);
-
-  } else if (this->context->pix_fmt == PIX_FMT_YUV411P) {
-
-    yuv411_to_yv12(
-     /* Y */
-      this->av_frame->data[0],
-      this->av_frame->linesize[0],
-      img->base[0],
-      img->pitches[0],
-     /* U */
-      this->av_frame->data[1],
-      this->av_frame->linesize[1],
-      img->base[1],
-      img->pitches[1],
-     /* V */
-      this->av_frame->data[2],
-      this->av_frame->linesize[2],
-      img->base[2],
-      img->pitches[2],
-     /* width x height */
-      img->width,
-      img->height);
-
-  } else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
-          
-    int x, plane_ptr = 0;
-    uint32_t *argb_pixels;
-    uint32_t argb;
-
-    for(y = 0; y < img->height; y++) {
-      argb_pixels = (uint32_t *)sy;
-      for(x = 0; x < img->width; x++) {
-        uint8_t r, g, b;
-              
-        /* this is endian-safe as the ARGB pixels are stored in
-         * machine order */
-        argb = *argb_pixels++;
-        r = (argb >> 16) & 0xFF;
-        g = (argb >>  8) & 0xFF;
-        b = (argb >>  0) & 0xFF;
-
-        this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
-        this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
-        this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else if (this->context->pix_fmt == PIX_FMT_RGB565) {
-
-    int x, plane_ptr = 0;
-    uint8_t *src;
-    uint16_t pixel16;
-
-    for(y = 0; y < img->height; y++) {
-      src = sy;
-      for(x = 0; x < img->width; x++) {
-        uint8_t r, g, b;
-              
-        /* a 16-bit RGB565 pixel is supposed to be stored in native-endian
-         * byte order; the following should be endian-safe */
-        pixel16 = *((uint16_t *)src);
-        src += 2;
-        b = (pixel16 << 3) & 0xFF;
-        g = (pixel16 >> 3) & 0xFF;
-        r = (pixel16 >> 8) & 0xFF;
-
-        this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
-        this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
-        this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else if (this->context->pix_fmt == PIX_FMT_RGB555) {
-          
-    int x, plane_ptr = 0;
-    uint8_t *src;
-    uint16_t pixel16;
-            
-    for(y = 0; y < img->height; y++) {
-      src = sy;
-      for(x = 0; x < img->width; x++) {
-        uint8_t r, g, b;
-              
-        /* a 16-bit RGB555 pixel is supposed to be stored in native-endian
-         * byte order; the following should be endian-safe */
-        pixel16 = *((uint16_t *)src);
-        src += 2;
-        b = (pixel16 << 3) & 0xFF;
-        g = (pixel16 >> 2) & 0xFF;
-        r = (pixel16 >> 7) & 0xFF;
-
-        this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
-        this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
-        this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else if (this->context->pix_fmt == PIX_FMT_BGR24) {
-
-    int x, plane_ptr = 0;
-    uint8_t *src;
-
-    for(y = 0; y < img->height; y++) {
-      src = sy;
-      for(x = 0; x < img->width; x++) {
-        uint8_t r, g, b;
-              
-        b = *src++;
-        g = *src++;
-        r = *src++;
-
-        this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
-        this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
-        this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else if (this->context->pix_fmt == PIX_FMT_RGB24) {
-
-    int x, plane_ptr = 0;
-    uint8_t *src;
-
-    for(y = 0; y < img->height; y++) {
-      src = sy;
-      for(x = 0; x < img->width; x++) {
-        uint8_t r, g, b;
-              
-        r = *src++;
-        g = *src++;
-        b = *src++;
-
-        this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
-        this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
-        this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else if (this->context->pix_fmt == PIX_FMT_PAL8) {
-          
-    int x, plane_ptr = 0;
-    uint8_t *src;
-    uint8_t pixel;
-    uint32_t *palette32 = (uint32_t *)su;  /* palette is in data[1] */
-    uint32_t rgb_color;
-    uint8_t r, g, b;
-    uint8_t y_palette[256];
-    uint8_t u_palette[256];
-    uint8_t v_palette[256];
-
-    for (x = 0; x < 256; x++) {
-      rgb_color = palette32[x];
-      b = rgb_color & 0xFF;
-      rgb_color >>= 8;
-      g = rgb_color & 0xFF;
-      rgb_color >>= 8;
-      r = rgb_color & 0xFF;
-      y_palette[x] = COMPUTE_Y(r, g, b);
-      u_palette[x] = COMPUTE_U(r, g, b);
-      v_palette[x] = COMPUTE_V(r, g, b);
-    }
-
-    for(y = 0; y < img->height; y++) {
-      src = sy;
-      for(x = 0; x < img->width; x++) {
-        pixel = *src++;
-
-        this->yuv.y[plane_ptr] = y_palette[pixel];
-        this->yuv.u[plane_ptr] = u_palette[pixel];
-        this->yuv.v[plane_ptr] = v_palette[pixel];
-        plane_ptr++;
-      }
-      sy += this->av_frame->linesize[0];
-    }
-            
-    yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
-          
-  } else {
-          
-    for (y=0; y<img->height; y++) {
-      xine_fast_memcpy (dy, sy, img->width);
-  
-      dy += img->pitches[0];
-  
-      sy += this->av_frame->linesize[0];
-    }
-
-    for (y=0; y<(img->height/2); y++) {
-      
-      if (this->context->pix_fmt != PIX_FMT_YUV444P) {
-        
-        xine_fast_memcpy (du, su, img->width/2);
-        xine_fast_memcpy (dv, sv, img->width/2);
-        
-      } else {
-        
-        int x;
-        uint8_t *src;
-        uint8_t *dst;
-      
-        /* subsample */
-        
-        src = su; dst = du;
-        for (x=0; x<(img->width/2); x++) {
-          *dst = *src;
-          dst++;
-          src += 2;
-        }
-        src = sv; dst = dv;
-        for (x=0; x<(img->width/2); x++) {
-          *dst = *src;
-          dst++;
-          src += 2;
-        }
-
-      }
-  
-      du += img->pitches[1];
-      dv += img->pitches[2];
-
-      if (this->context->pix_fmt != PIX_FMT_YUV420P) {
-        su += 2*this->av_frame->linesize[1];
-        sv += 2*this->av_frame->linesize[2];
-      } else {
-        su += this->av_frame->linesize[1];
-        sv += this->av_frame->linesize[2];
-      }
-    }
-  }
-}
-
-static void ff_check_bufsize (ff_video_decoder_t *this, int size) {
-  if (size > this->bufsize) {
-    this->bufsize = size + size / 2;
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-	    _("ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"), 
-	    this->bufsize);
-    this->buf = realloc(this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE );
-  }
-}
-
-static void ff_handle_preview_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-  int codec_type;
-
-  lprintf ("preview buffer\n");
-
-  codec_type = buf->type & 0xFFFF0000;
-  if (codec_type == BUF_VIDEO_MPEG) {
-    this->is_mpeg12 = 1;
-    if ( this->mpeg_parser == NULL ) {
-      this->mpeg_parser = calloc(1, sizeof(mpeg_parser_t));
-      mpeg_parser_init(this->mpeg_parser);
-      this->decoder_init_mode = 0;
-    }
-  }
-
-  if (this->decoder_init_mode && !this->is_mpeg12) {
-    init_video_codec(this, codec_type);
-    init_postprocess(this);
-    this->decoder_init_mode = 0;
-  }
-}
-
-static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-
-  lprintf ("header buffer\n");
-
-  /* accumulate data */
-  ff_check_bufsize(this, this->size + buf->size);
-  xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
-  this->size += buf->size;
-
-  if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-    int codec_type;
-
-    lprintf ("header complete\n");
-    codec_type = buf->type & 0xFFFF0000;
-
-    if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
-
-      lprintf("standard header\n");
-    
-      /* init package containing bih */
-      memcpy ( &this->bih, this->buf, sizeof(xine_bmiheader) );
-
-      if (this->bih.biSize > sizeof(xine_bmiheader)) {
-      this->context->extradata_size = this->bih.biSize - sizeof(xine_bmiheader);
-        this->context->extradata = malloc(this->context->extradata_size + 
-                                          FF_INPUT_BUFFER_PADDING_SIZE);
-        memcpy(this->context->extradata, this->buf + sizeof(xine_bmiheader),
-              this->context->extradata_size);
-      }
-      
-      this->context->bits_per_coded_sample = this->bih.biBitCount;
-            
-    } else {
-    
-      switch (codec_type) {
-      case BUF_VIDEO_RV10:
-      case BUF_VIDEO_RV20:
-        this->bih.biWidth  = _X_BE_16(&this->buf[12]);
-        this->bih.biHeight = _X_BE_16(&this->buf[14]);
-        
-        this->context->sub_id = _X_BE_32(&this->buf[30]);
-
-        this->context->slice_offset = calloc(SLICE_OFFSET_SIZE, sizeof(int));
-        this->slice_offset_size = SLICE_OFFSET_SIZE;
-
-        this->context->extradata_size = this->size - 26;
-	if (this->context->extradata_size < 8) {
-	  this->context->extradata_size= 8;
-	  this->context->extradata = malloc(this->context->extradata_size +
-		                            FF_INPUT_BUFFER_PADDING_SIZE);
-          ((uint32_t *)this->context->extradata)[0] = 0;
-	  if (codec_type == BUF_VIDEO_RV10)
-	     ((uint32_t *)this->context->extradata)[1] = 0x10000000;
-	  else
-	     ((uint32_t *)this->context->extradata)[1] = 0x10003001;
-	} else {
-          this->context->extradata = malloc(this->context->extradata_size +
-	                                    FF_INPUT_BUFFER_PADDING_SIZE);
-	  memcpy(this->context->extradata, this->buf + 26,
-	         this->context->extradata_size);
-	}
-
-	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                "ffmpeg_video_dec: buf size %d\n", this->size);
-
-	lprintf("w=%d, h=%d\n", this->bih.biWidth, this->bih.biHeight);
-
-        break;
-      default:
-        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-                "ffmpeg_video_dec: unknown header for buf type 0x%X\n", codec_type);
-        return;
-      }
-    }
-
-    /* reset accumulator */
-    this->size = 0;
-  }
-}
-
-static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-  /* take care of all the various types of special buffers 
-  * note that order is important here */
-  lprintf("special buffer\n");
-
-  if (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM &&
-      !this->context->extradata_size) {
-
-    lprintf("BUF_SPECIAL_STSD_ATOM\n");
-    this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = malloc(buf->decoder_info[2] + 
-				      FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-      buf->decoder_info[2]);
-
-  } else if (buf->decoder_info[1] == BUF_SPECIAL_DECODER_CONFIG &&
-            !this->context->extradata_size) {
-    
-    lprintf("BUF_SPECIAL_DECODER_CONFIG\n");
-    this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = malloc(buf->decoder_info[2] +
-				      FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-      buf->decoder_info[2]);
-      
-  } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-    unsigned int i;
-
-    palette_entry_t *demuxer_palette;
-    AVPaletteControl *decoder_palette;
-    
-    lprintf("BUF_SPECIAL_PALETTE\n");
-    this->context->palctrl = &this->palette_control;
-    decoder_palette = (AVPaletteControl *)this->context->palctrl;
-    demuxer_palette = (palette_entry_t *)buf->decoder_info_ptr[2];
-
-    for (i = 0; i < buf->decoder_info[2]; i++) {
-      decoder_palette->palette[i] = 
-        (demuxer_palette[i].r << 16) |
-        (demuxer_palette[i].g <<  8) |
-        (demuxer_palette[i].b <<  0);
-    }
-    decoder_palette->palette_changed = 1;
-
-  } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-    int i;
-  
-    lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
-    this->context->slice_count = buf->decoder_info[2]+1;
-
-    lprintf("slice_count=%d\n", this->context->slice_count);
-    
-    if(this->context->slice_count > this->slice_offset_size) {
-      this->context->slice_offset = realloc(this->context->slice_offset,
-                                            sizeof(int)*this->context->slice_count);
-      this->slice_offset_size = this->context->slice_count;
-    }
-    
-    for(i = 0; i < this->context->slice_count; i++) {
-      this->context->slice_offset[i] = 
-        ((uint32_t *) buf->decoder_info_ptr[2])[(2*i)+1];
-      lprintf("slice_offset[%d]=%d\n", i, this->context->slice_offset[i]);
-    }
-  }
-}
-
-static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-
-  vo_frame_t *img;
-  int         free_img;
-  int         got_picture, len;
-  int         offset = 0;
-  int         flush = 0;
-  int         size = buf->size;
-
-  lprintf("handle_mpeg12_buffer\n");
-
-  while ((size > 0) || (flush == 1)) {
-
-    uint8_t *current;
-    int next_flush;
-
-    got_picture = 0;
-    if (!flush) {
-      current = mpeg_parser_decode_data(this->mpeg_parser,
-                                        buf->content + offset, buf->content + offset + size,
-                                        &next_flush);
-    } else {
-      current = buf->content + offset + size; /* end of the buffer */
-      next_flush = 0;
-    }
-    if (current == NULL) {
-      lprintf("current == NULL\n");
-      return;
-    }
-
-    if (this->mpeg_parser->has_sequence) {
-      ff_handle_mpeg_sequence(this, this->mpeg_parser);
-    }
-
-    if (!this->decoder_ok)
-      return;
-    
-    if (flush) {
-      lprintf("flush lavc buffers\n");
-      /* hack: ffmpeg outputs the last frame if size=0 */
-      this->mpeg_parser->buffer_size = 0;
-    }
-
-    /* skip decoding b frames if too late */
-    this->context->hurry_up = (this->skipframes > 0);
-
-    lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
-    len = avcodec_decode_video (this->context, this->av_frame,
-                                &got_picture, this->mpeg_parser->chunk_buffer,
-                                this->mpeg_parser->buffer_size);
-    lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
-            len, got_picture);
-    len = current - buf->content - offset;
-    lprintf("avcodec_decode_video: consumed_size=%d\n", len);
-    
-    flush = next_flush;
-
-    if ((len < 0) || (len > buf->size)) {
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                "ffmpeg_video_dec: error decompressing frame\n");
-      size = 0; /* draw a bad frame and exit */
-    } else {
-      size -= len;
-      offset += len;
-    }
-
-    if (got_picture && this->av_frame->data[0]) {
-      /* got a picture, draw it */
-      if(!this->av_frame->opaque) {
-        /* indirect rendering */
-        img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                  this->bih.biWidth,
-                                                  this->bih.biHeight,
-                                                  this->aspect_ratio, 
-                                                  this->output_format,
-                                                  VO_BOTH_FIELDS|this->frame_flags);
-        free_img = 1;
-      } else {
-        /* DR1 */
-        img = (vo_frame_t*) this->av_frame->opaque;
-        free_img = 0;
-      }
-
-      img->pts  = this->pts;
-      this->pts = 0;
-
-      if (this->av_frame->repeat_pict)
-        img->duration = this->video_step * 3 / 2;
-      else
-        img->duration = this->video_step;
-
-      img->crop_right  = this->crop_right;
-      img->crop_bottom = this->crop_bottom;
-      
-      this->skipframes = img->draw(img, this->stream);
-
-      if(free_img)
-        img->free(img);
-
-    } else {
-
-      if (this->context->hurry_up) {
-        /* skipped frame, output a bad frame */
-        img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                  this->bih.biWidth,
-                                                  this->bih.biHeight,
-                                                  this->aspect_ratio, 
-                                                  this->output_format,
-                                                  VO_BOTH_FIELDS|this->frame_flags);
-        img->pts       = 0;
-        img->duration  = this->video_step;
-        img->bad_frame = 1;
-        this->skipframes = img->draw(img, this->stream);
-        img->free(img);
-      }
-    }
-  }
-}
-
-static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-  uint8_t *chunk_buf = this->buf;
-  AVRational avr00 = {0, 1};
-
-  lprintf("handle_buffer\n");
-
-  if (!this->decoder_ok) {
-    if (this->decoder_init_mode) {
-      int codec_type = buf->type & 0xFFFF0000;
-
-      /* init ffmpeg decoder */
-      init_video_codec(this, codec_type);
-      init_postprocess(this);
-      this->decoder_init_mode = 0;
-    } else {
-      return;
-    }
-  }
-
-  if (buf->decoder_flags & BUF_FLAG_FRAME_START) {
-    lprintf("BUF_FLAG_FRAME_START\n");
-    this->size = 0;
-  }
-
-  /* data accumulation */
-  if (buf->size > 0) {
-    if ((this->size == 0) &&
-	((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) && 
-	(buf->decoder_flags & BUF_FLAG_FRAME_END)) {
-      /* buf contains a complete frame */
-      /* no memcpy needed */
-      chunk_buf = buf->content;
-      this->size = buf->size;
-      lprintf("no memcpy needed to accumulate data\n");
-    } else {
-      /* copy data into our internal buffer */
-      ff_check_bufsize(this, this->size + buf->size);
-      chunk_buf = this->buf; /* ff_check_bufsize might realloc this->buf */
-
-      xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
-      
-      this->size += buf->size;
-      lprintf("accumulate data into this->buf\n");
-    }
-  }
-
-  if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-
-    vo_frame_t *img;
-    int         free_img;
-    int         got_picture, len;
-    int         got_one_picture = 0;
-    int         offset = 0;
-    int         codec_type = buf->type & 0xFFFF0000;
-    int         video_step_to_use = this->video_step;
-
-    /* pad input data */
-    /* note: bitstream, alt bitstream reader or something will cause
-     * severe mpeg4 artifacts if padding is less than 32 bits.
-     */
-    memset(&chunk_buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE);
-
-    while (this->size > 0) {
-      
-      /* DV frames can be completely skipped */
-      if( codec_type == BUF_VIDEO_DV && this->skipframes ) {
-        this->size = 0;
-        got_picture = 0;
-      } else {
-        /* skip decoding b frames if too late */
-        this->context->hurry_up = (this->skipframes > 0);
-
-        lprintf("buffer size: %d\n", this->size);
-        len = avcodec_decode_video (this->context, this->av_frame,
-                                    &got_picture, &chunk_buf[offset],
-                                    this->size);
-        lprintf("consumed size: %d, got_picture: %d\n", len, got_picture);
-        if ((len <= 0) || (len > this->size)) {
-          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-                    "ffmpeg_video_dec: error decompressing frame\n");
-          this->size = 0;
-
-        } else {
-
-          offset += len;
-          this->size -= len;
-
-          if (this->size > 0) {
-            ff_check_bufsize(this, this->size);
-            memmove (this->buf, &chunk_buf[offset], this->size);
-            chunk_buf = this->buf;
-          }
-        }
-      }
-
-      /* use externally provided video_step or fall back to stream's time_base otherwise */
-      video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->time_base.num / this->context->time_base.den);
-
-      /* aspect ratio provided by ffmpeg, override previous setting */
-      if ((this->aspect_ratio_prio < 2) &&
-	  av_cmp_q(this->context->sample_aspect_ratio, avr00)) {
-
-        if (!this->bih.biWidth || !this->bih.biHeight) {
-          this->bih.biWidth  = this->context->width;
-          this->bih.biHeight = this->context->height;
-        }
-
-	this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) * 
-	  (double)this->bih.biWidth / (double)this->bih.biHeight;
-	this->aspect_ratio_prio = 2;
-	lprintf("ffmpeg aspect ratio: %f\n", this->aspect_ratio);
-	set_stream_info(this);
-      }
-
-      if (got_picture && this->av_frame->data[0]) {
-        /* got a picture, draw it */
-        got_one_picture = 1;
-        if(!this->av_frame->opaque) {
-	  /* indirect rendering */
-
-	  /* initialize the colorspace converter */
-	  if (!this->cs_convert_init) {
-	    if ((this->context->pix_fmt == PIX_FMT_RGBA32) ||
-	        (this->context->pix_fmt == PIX_FMT_RGB565) ||
-	        (this->context->pix_fmt == PIX_FMT_RGB555) ||
-	        (this->context->pix_fmt == PIX_FMT_BGR24) ||
-	        (this->context->pix_fmt == PIX_FMT_RGB24) ||
-	        (this->context->pix_fmt == PIX_FMT_PAL8)) {
-	      this->output_format = XINE_IMGFMT_YUY2;
-	      init_yuv_planes(&this->yuv, this->bih.biWidth, this->bih.biHeight);
-	      this->yuv_init = 1;
-	    }
-	    this->cs_convert_init = 1;
-	  }
-
-	  if (this->aspect_ratio_prio == 0) {
-	    this->aspect_ratio = (double)this->bih.biWidth / (double)this->bih.biHeight;
-	    this->aspect_ratio_prio = 1;
-	    lprintf("default aspect ratio: %f\n", this->aspect_ratio);
-	    set_stream_info(this);
-	  }
-
-          /* xine-lib expects the framesize to be a multiple of 16x16 (macroblock) */
-          img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                    (this->bih.biWidth  + 15) & ~15,
-                                                    (this->bih.biHeight + 15) & ~15,
-                                                    this->aspect_ratio, 
-                                                    this->output_format,
-                                                    VO_BOTH_FIELDS|this->frame_flags);
-          free_img = 1;
-        } else {
-          /* DR1 */
-          img = (vo_frame_t*) this->av_frame->opaque;
-          free_img = 0;
-        }
-
-        /* post processing */
-        if(this->pp_quality != this->class->pp_quality)
-          pp_change_quality(this);
-
-        if(this->pp_available && this->pp_quality) {
-
-          if(this->av_frame->opaque) {
-            /* DR1 */
-            img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                      (img->width  + 15) & ~15,
-                                                      (img->height + 15) & ~15,
-                                                      this->aspect_ratio, 
-                                                      this->output_format,
-                                                      VO_BOTH_FIELDS|this->frame_flags);
-            free_img = 1;
-          }
-
-          pp_postprocess(this->av_frame->data, this->av_frame->linesize, 
-                        img->base, img->pitches, 
-                        img->width, img->height,
-                        this->av_frame->qscale_table, this->av_frame->qstride,
-                        this->pp_mode, this->pp_context, 
-                        this->av_frame->pict_type);
-
-        } else if (!this->av_frame->opaque) {
-	  /* colorspace conversion or copy */
-          ff_convert_frame(this, img);
-        }
-
-        img->pts  = this->pts;
-        this->pts = 0;
-
-        /* workaround for weird 120fps streams */
-        if( video_step_to_use == 750 ) {
-          /* fallback to the VIDEO_PTS_MODE */
-          video_step_to_use = 0;
-        }
-        
-        if (this->av_frame->repeat_pict)
-          img->duration = video_step_to_use * 3 / 2;
-        else
-          img->duration = video_step_to_use;
-
-        /* additionally crop away the extra pixels due to adjusting frame size above */
-        img->crop_right  = this->crop_right  + (img->width  - this->bih.biWidth);
-        img->crop_bottom = this->crop_bottom + (img->height - this->bih.biHeight);
-
-        /* transfer some more frame settings for deinterlacing */
-        img->progressive_frame = !this->av_frame->interlaced_frame;
-        img->top_field_first   = this->av_frame->top_field_first;
-
-        this->skipframes = img->draw(img, this->stream);
-        
-        if(free_img)
-          img->free(img);
-      }
-    }
-
-    /* workaround for demux_mpeg_pes sending fields as frames:
-     * do not generate a bad frame for the first field picture
-     */
-    if (!got_one_picture && (this->size || this->video_step || this->assume_bad_field_picture)) {
-      /* skipped frame, output a bad frame (use size 16x16, when size still uninitialized) */
-      img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                (this->bih.biWidth  <= 0) ? 16 : ((this->bih.biWidth  + 15) & ~15),
-                                                (this->bih.biHeight <= 0) ? 16 : ((this->bih.biHeight + 15) & ~15),
-                                                this->aspect_ratio, 
-                                                this->output_format,
-                                                VO_BOTH_FIELDS|this->frame_flags);
-      /* set PTS to allow early syncing */
-      img->pts       = this->pts;
-      this->pts      = 0;
-
-      img->duration  = video_step_to_use;
-
-      /* additionally crop away the extra pixels due to adjusting frame size above */
-      img->crop_right  = ((this->bih.biWidth  <= 0) ? 0 : this->crop_right)  + (img->width  - this->bih.biWidth);
-      img->crop_bottom = ((this->bih.biHeight <= 0) ? 0 : this->crop_bottom) + (img->height - this->bih.biHeight);
-
-      img->bad_frame = 1;
-      this->skipframes = img->draw(img, this->stream);
-      img->free(img);
-    }
-
-    this->assume_bad_field_picture = !got_one_picture;
-  }
-}
-
-static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
-  ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
-
-  lprintf ("processing packet type = %08x, len = %d, decoder_flags=%08x\n", 
-           buf->type, buf->size, buf->decoder_flags);
-
-  if (buf->decoder_flags & BUF_FLAG_FRAMERATE) {
-    this->video_step = buf->decoder_info[0];
-    _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
-  }
-
-  if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
-  
-    ff_handle_preview_buffer(this, buf);
-
-  } else {
-
-    if (buf->decoder_flags & BUF_FLAG_SPECIAL) {
-
-      ff_handle_special_buffer(this, buf);
-		     
-    }
-
-    if (buf->decoder_flags & BUF_FLAG_HEADER) {
-
-      ff_handle_header_buffer(this, buf);
-
-      if (buf->decoder_flags & BUF_FLAG_ASPECT) {
-	if (this->aspect_ratio_prio < 3) {
-	  this->aspect_ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
-	  this->aspect_ratio_prio = 3;
-	  lprintf("aspect ratio: %f\n", this->aspect_ratio);
-	  set_stream_info(this);
-	}
-      }  
-
-    } else {
-
-      /* decode */
-      if (buf->pts)
-	this->pts = buf->pts;
-
-      if (this->is_mpeg12) {
-	ff_handle_mpeg12_buffer(this, buf);
-      } else {
-	ff_handle_buffer(this, buf);
-      }
-
-    }
-  }
-}
-
-static void ff_flush (video_decoder_t *this_gen) {
-  lprintf ("ff_flush\n");
-}
-
-static void ff_reset (video_decoder_t *this_gen) {
-  ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
-
-  lprintf ("ff_reset\n");
-
-  this->size = 0;
-
-  if(this->context && this->decoder_ok)
-    avcodec_flush_buffers(this->context);
-  
-  if (this->is_mpeg12)
-    mpeg_parser_reset(this->mpeg_parser);
-}
-
-static void ff_discontinuity (video_decoder_t *this_gen) {
-  ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
-  
-  lprintf ("ff_discontinuity\n");
-  this->pts = 0;
-}
-
-static void ff_dispose (video_decoder_t *this_gen) {
-  ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
-
-  lprintf ("ff_dispose\n");
-  
-  if (this->decoder_ok) {
-    xine_list_iterator_t it;
-    AVFrame *av_frame;
-        
-    pthread_mutex_lock(&ffmpeg_lock);
-    avcodec_close (this->context);
-    pthread_mutex_unlock(&ffmpeg_lock);
-    
-    /* frame garbage collector here - workaround for buggy ffmpeg codecs that
-     * don't release their DR1 frames */
-    while( (it = xine_list_front(this->dr1_frames)) != NULL )
-    {
-      av_frame = (AVFrame *)xine_list_get_value(this->dr1_frames, it);
-      release_buffer(this->context, av_frame);
-    }
-    
-    this->stream->video_out->close(this->stream->video_out, this->stream);
-    this->decoder_ok = 0;
-  }
-
-  if(this->context && this->context->slice_offset)
-    free(this->context->slice_offset);
-
-  if(this->context && this->context->extradata)
-    free(this->context->extradata);
-
-  if(this->yuv_init)
-    free_yuv_planes(&this->yuv);
-  
-  if( this->context )
-    free( this->context );
-
-  if( this->av_frame )
-    free( this->av_frame );
-  
-  if (this->buf)
-    free(this->buf);
-  this->buf = NULL;
-  
-  if(this->pp_context)
-    pp_free_context(this->pp_context);
-    
-  if(this->pp_mode)
-    pp_free_mode(this->pp_mode);
-
-  mpeg_parser_dispose(this->mpeg_parser);
-    
-  xine_list_delete(this->dr1_frames);
-  
-  free (this_gen);
-}
-
-static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, xine_stream_t *stream) {
-
-  ff_video_decoder_t  *this ;
-
-  lprintf ("open_plugin\n");
-
-  this = calloc(1, sizeof (ff_video_decoder_t));
-
-  this->video_decoder.decode_data         = ff_decode_data;
-  this->video_decoder.flush               = ff_flush;
-  this->video_decoder.reset               = ff_reset;
-  this->video_decoder.discontinuity       = ff_discontinuity;
-  this->video_decoder.dispose             = ff_dispose;
-  this->size                              = 0;
-
-  this->stream                            = stream;
-  this->class                             = (ff_video_class_t *) class_gen;
-
-  this->av_frame          = avcodec_alloc_frame();
-  this->context           = avcodec_alloc_context();
-  this->context->opaque   = this;
-  this->context->palctrl  = NULL;
-  
-  this->decoder_ok        = 0;
-  this->decoder_init_mode = 1;
-  this->buf               = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
-  this->bufsize           = VIDEOBUFSIZE;
-
-  this->is_mpeg12         = 0;
-  this->aspect_ratio      = 0;
-
-  this->pp_quality        = 0;
-  this->pp_context        = NULL;
-  this->pp_mode           = NULL;
-  
-  this->mpeg_parser       = NULL;
-  
-  this->dr1_frames        = xine_list_new();
-
-#ifdef LOG
-  this->debug_fmt = -1;
-#endif
-
-  return &this->video_decoder;
-}
-
-static char *ff_video_get_identifier (video_decoder_class_t *this) {
-  return "ffmpeg video";
-}
-
-static char *ff_video_get_description (video_decoder_class_t *this) {
-  return "ffmpeg based video decoder plugin";
-}
-
-static void ff_video_dispose_class (video_decoder_class_t *this) {
-  free (this);
-}
-
-void *init_video_plugin (xine_t *xine, void *data) {
-
-  ff_video_class_t *this;
-  config_values_t  *config;
-  
-  this = calloc(1, sizeof (ff_video_class_t));
-
-  this->decoder_class.open_plugin     = ff_video_open_plugin;
-  this->decoder_class.get_identifier  = ff_video_get_identifier;
-  this->decoder_class.get_description = ff_video_get_description;
-  this->decoder_class.dispose         = ff_video_dispose_class;
-  this->xine                          = xine;
-
-  pthread_once( &once_control, init_once_routine );
-  
-  /* Configuration for post processing quality - default to mid (3) for the
-   * moment */
-  config = xine->config;
-  
-  this->pp_quality = xine->config->register_range(config, "video.processing.ffmpeg_pp_quality", 3, 
-    0, PP_QUALITY_MAX,
-    _("MPEG-4 postprocessing quality"),
-    _("You can adjust the amount of post processing applied to MPEG-4 video.\n"
-      "Higher values result in better quality, but need more CPU. Lower values may "
-      "result in image defects like block artifacts. For high quality content, "
-      "too heavy post processing can actually make the image worse by blurring it "
-      "too much."),
-    10, pp_quality_cb, this);
-  
-  this->thread_count = xine->config->register_num(config, "video.processing.ffmpeg_thread_count", 1, 
-    _("FFmpeg video decoding thread count"),
-    _("You can adjust the number of video decoding threads which FFmpeg may use.\n"
-      "Higher values should speed up decoding but it depends on the codec used "
-      "whether parallel decoding is supported. A rule of thumb is to have one "
-      "decoding thread per logical CPU (typically 1 to 4).\n"
-      "A change of this setting will take effect with playing the next stream."),
-    10, thread_count_cb, this);
-
-  this->skip_loop_filter_enum = xine->config->register_enum(config, "video.processing.ffmpeg_skip_loop_filter", 0, 
-    (char **)skip_loop_filter_enum_names,
-    _("Skip loop filter"),
-    _("You can control for which frames the loop filter shall be skipped after "
-      "decoding.\n"
-      "Skipping the loop filter will speedup decoding but may lead to artefacts. "
-      "The number of frames for which it is skipped increases from 'none' to 'all'. "
-      "The default value leaves the decision up to the implementation.\n"
-      "A change of this setting will take effect with playing the next stream."),
-    10, skip_loop_filter_enum_cb, this);
-
-  this->choose_speed_over_accuracy = xine->config->register_bool(config, "video.processing.ffmpeg_choose_speed_over_accuracy", 0, 
-    _("Choose speed over specification compliance"),
-    _("You may want to allow speed cheats which violate codec specification.\n"
-      "Cheating may speed up decoding but can also lead to decoding artefacts.\n"
-      "A change of this setting will take effect with playing the next stream."),
-    10, choose_speed_over_accuracy_cb, this);
-
-  return this;
-}
-
-static uint32_t supported_video_types[] = { 
-  #ifdef CONFIG_MSMPEG4V1_DECODER
-  BUF_VIDEO_MSMPEG4_V1,
-  #endif
-  #ifdef CONFIG_MSMPEG4V2_DECODER
-  BUF_VIDEO_MSMPEG4_V2,
-  #endif
-  #ifdef CONFIG_MSMPEG4V3_DECODER
-  BUF_VIDEO_MSMPEG4_V3,
-  #endif
-  #ifdef CONFIG_WMV1_DECODER
-  BUF_VIDEO_WMV7,
-  #endif
-  #ifdef CONFIG_WMV2_DECODER
-  BUF_VIDEO_WMV8,
-  #endif
-  #ifdef CONFIG_WMV3_DECODER
-  BUF_VIDEO_WMV9,
-  #endif
-  #ifdef CONFIG_VC1_DECODER
-  BUF_VIDEO_VC1,
-  #endif
-  #ifdef CONFIG_MPEG4_DECODER
-  BUF_VIDEO_MPEG4,
-  #endif
-  #ifdef CONFIG_MPEG4_DECODER
-  BUF_VIDEO_XVID,
-  #endif
-  #ifdef CONFIG_MPEG4_DECODER
-  BUF_VIDEO_DIVX5,
-  #endif
-  #ifdef CONFIG_MPEG4_DECODER
-  BUF_VIDEO_3IVX,
-  #endif
-  #ifdef CONFIG_MJPEG_DECODER
-  BUF_VIDEO_JPEG,
-  #endif
-  #ifdef CONFIG_MJPEG_DECODER
-  BUF_VIDEO_MJPEG,
-  #endif
-  #ifdef CONFIG_MJPEGB_DECODER
-  BUF_VIDEO_MJPEG_B,
-  #endif
-  #ifdef CONFIG_H263I_DECODER
-  BUF_VIDEO_I263,
-  #endif
-  #ifdef CONFIG_H263_DECODER
-  BUF_VIDEO_H263,
-  #endif
-  #ifdef CONFIG_RV10_DECODER
-  BUF_VIDEO_RV10,
-  #endif
-  #ifdef CONFIG_RV20_DECODER
-  BUF_VIDEO_RV20,
-  #endif
-  #ifdef CONFIG_INDEO3_DECODER
-  BUF_VIDEO_IV31,
-  #endif
-  #ifdef CONFIG_INDEO3_DECODER
-  BUF_VIDEO_IV32,
-  #endif
-  #ifdef CONFIG_SVQ1_DECODER
-  BUF_VIDEO_SORENSON_V1,
-  #endif
-  #ifdef CONFIG_SVQ3_DECODER
-  BUF_VIDEO_SORENSON_V3,
-  #endif
-  #ifdef CONFIG_DVVIDEO_DECODER
-  BUF_VIDEO_DV,
-  #endif
-  #ifdef CONFIG_HUFFYUV_DECODER
-  BUF_VIDEO_HUFFYUV,
-  #endif
-  #ifdef CONFIG_VP3_DECODER
-  BUF_VIDEO_VP31,
-  #endif
-  #ifdef CONFIG_VP5_DECODER
-  BUF_VIDEO_VP5,
-  #endif
-  #ifdef CONFIG_VP6_DECODER
-  BUF_VIDEO_VP6,
-  BUF_VIDEO_VP6F,
-  #endif
-  #ifdef CONFIG_4XM_DECODER
-  BUF_VIDEO_4XM,
-  #endif
-  #ifdef CONFIG_CINEPAK_DECODER
-  BUF_VIDEO_CINEPAK,
-  #endif
-  #ifdef CONFIG_MSVIDEO1_DECODER
-  BUF_VIDEO_MSVC,
-  #endif
-  #ifdef CONFIG_MSRLE_DECODER
-  BUF_VIDEO_MSRLE,
-  #endif
-  #ifdef CONFIG_RPZA_DECODER
-  BUF_VIDEO_RPZA,
-  #endif
-  #ifdef CONFIG_CYUV_DECODER
-  BUF_VIDEO_CYUV,
-  #endif
-  #ifdef CONFIG_ROQ_DECODER
-  BUF_VIDEO_ROQ,
-  #endif
-  #ifdef CONFIG_IDCIN_DECODER
-  BUF_VIDEO_IDCIN,
-  #endif
-  #ifdef CONFIG_XAN_WC3_DECODER
-  BUF_VIDEO_WC3,
-  #endif
-  #ifdef CONFIG_WS_VQA_DECODER
-  BUF_VIDEO_VQA,
-  #endif
-  #ifdef CONFIG_INTERPLAY_VIDEO_DECODER
-  BUF_VIDEO_INTERPLAY,
-  #endif
-  #ifdef CONFIG_FLIC_DECODER
-  BUF_VIDEO_FLI,
-  #endif
-  #ifdef CONFIG_8BPS_DECODER
-  BUF_VIDEO_8BPS,
-  #endif
-  #ifdef CONFIG_SMC_DECODER
-  BUF_VIDEO_SMC,
-  #endif
-  #ifdef CONFIG_TRUEMOTION1_DECODER
-  BUF_VIDEO_DUCKTM1,
-  #endif
-  #ifdef CONFIG_TRUEMOTION2_DECODER
-  BUF_VIDEO_DUCKTM2,
-  #endif
-  #ifdef CONFIG_VMDVIDEO_DECODER
-  BUF_VIDEO_VMD,
-  #endif
-  #ifdef CONFIG_ZLIB_DECODER
-  BUF_VIDEO_ZLIB,
-  #endif
-  #ifdef CONFIG_MSZH_DECODER
-  BUF_VIDEO_MSZH,
-  #endif
-  #ifdef CONFIG_ASV1_DECODER
-  BUF_VIDEO_ASV1,
-  #endif
-  #ifdef CONFIG_ASV2_DECODER
-  BUF_VIDEO_ASV2,
-  #endif
-  #ifdef CONFIG_VCR1_DECODER
-  BUF_VIDEO_ATIVCR1,
-  #endif
-  #ifdef CONFIG_FLV_DECODER
-  BUF_VIDEO_FLV1,
-  #endif
-  #ifdef CONFIG_QTRLE_DECODER
-  BUF_VIDEO_QTRLE,
-  #endif
-  #ifdef CONFIG_H264_DECODER
-  BUF_VIDEO_H264,
-  #endif
-  #ifdef CONFIG_H261_DECODER
-  BUF_VIDEO_H261,
-  #endif
-  #ifdef CONFIG_AASC_DECODER
-  BUF_VIDEO_AASC,
-  #endif
-  #ifdef CONFIG_LOCO_DECODER
-  BUF_VIDEO_LOCO,
-  #endif
-  #ifdef CONFIG_QDRAW_DECODER
-  BUF_VIDEO_QDRW,
-  #endif
-  #ifdef CONFIG_QPEG_DECODER
-  BUF_VIDEO_QPEG,
-  #endif
-  #ifdef CONFIG_TSCC_DECODER
-  BUF_VIDEO_TSCC,
-  #endif
-  #ifdef CONFIG_ULTI_DECODER
-  BUF_VIDEO_ULTI,
-  #endif
-  #ifdef CONFIG_WNV1_DECODER
-  BUF_VIDEO_WNV1,
-  #endif
-  #ifdef CONFIG_VIXL_DECODER
-  BUF_VIDEO_XL,
-  #endif
-  #ifdef CONFIG_INDEO2_DECODER
-  BUF_VIDEO_RT21,
-  #endif
-  #ifdef CONFIG_FRAPS_DECODER
-  BUF_VIDEO_FPS1,
-  #endif
-  #ifdef CONFIG_MPEG1VIDEO_DECODER
-  BUF_VIDEO_MPEG,
-  #endif
-  #ifdef CONFIG_CSCD_DECODER
-  BUF_VIDEO_CSCD,
-  #endif
-  #ifdef CONFIG_AVS_DECODER
-  BUF_VIDEO_AVS,
-  #endif
-  #ifdef CONFIG_MMVIDEO_DECODER
-  BUF_VIDEO_ALGMM,
-  #endif
-  #ifdef CONFIG_ZMBV_DECODER
-  BUF_VIDEO_ZMBV,
-  #endif
-  #ifdef CONFIG_SMACKVIDEO_DECODER
-  BUF_VIDEO_SMACKER,
-  #endif
-  #ifdef CONFIG_NUV_DECODER
-  BUF_VIDEO_NUV,
-  #endif
-  #ifdef CONFIG_KMVC_DECODER
-  BUF_VIDEO_KMVC,
-  #endif
-  #ifdef CONFIG_FLASHSV_DECODER
-  BUF_VIDEO_FLASHSV,
-  #endif
-  #ifdef CONFIG_CAVS_DECODER
-  BUF_VIDEO_CAVS,
-  #endif
-  #ifdef CONFIG_VMNC_DECODER
-  BUF_VIDEO_VMNC,
-  #endif
-  #ifdef CONFIG_SNOW_DECODER
-  BUF_VIDEO_SNOW,
-  #endif
-  BUF_VIDEO_THEORA_RAW,
-  0 
-};
-
-static uint32_t wmv8_video_types[] = { 
-  BUF_VIDEO_WMV8,
-  0 
-};
-
-static uint32_t wmv9_video_types[] = { 
-  BUF_VIDEO_WMV9,
-  0 
-};
-
-decoder_info_t dec_info_ffmpeg_video = {
-  supported_video_types,   /* supported types */
-  6                        /* priority        */
-};
-
-decoder_info_t dec_info_ffmpeg_wmv8 = {
-  wmv8_video_types,        /* supported types */
-  0                        /* priority        */
-};
-
-decoder_info_t dec_info_ffmpeg_wmv9 = {
-  wmv9_video_types,        /* supported types */
-  0                        /* priority        */
-};
diff --git a/abs/core-testing/xine-lib/ffmpeg_xine.patch b/abs/core-testing/xine-lib/ffmpeg_xine.patch
deleted file mode 100644
index c1d7eb9..0000000
--- a/abs/core-testing/xine-lib/ffmpeg_xine.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ruaN src/combined/ffmpeg.orig/ff_audio_decoder.c src/combined/ffmpeg/ff_audio_decoder.c
---- src/combined/ffmpeg.orig/ff_audio_decoder.c	2008-12-02 08:30:44.000000000 +0000
-+++ src/combined/ffmpeg/ff_audio_decoder.c	2008-12-02 08:38:30.000000000 +0000
-@@ -269,7 +269,7 @@
-        * bits/sample for some codecs (e.g. MS ADPCM) */
-       this->audio_bits = 16;  
-   
--      this->context->bits_per_sample = this->audio_bits;
-+      this->context->bits_per_coded_sample = this->audio_bits;
-       this->context->sample_rate = this->audio_sample_rate;
-       this->context->channels    = this->audio_channels;
-       this->context->codec_id    = this->codec->id;
-@@ -322,12 +322,12 @@
- 
-     if (!this->output_open) {
-       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
--        avcodec_decode_audio (this->context,
-+        avcodec_decode_audio2 (this->context,
-                               (int16_t *)this->decode_buffer,
-                               &decode_buffer_size,
-                               &this->buf[0],
-                               this->size);
--	this->audio_bits = this->context->bits_per_sample;
-+	this->audio_bits = this->context->bits_per_coded_sample;
- 	this->audio_sample_rate = this->context->sample_rate;
- 	this->audio_channels = this->context->channels;
- 	if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
-diff -ruaN src/combined/ffmpeg.orig/ff_video_decoder.c src/combined/ffmpeg/ff_video_decoder.c
---- src/combined/ffmpeg.orig/ff_video_decoder.c	2008-12-02 08:33:53.000000000 +0000
-+++ src/combined/ffmpeg/ff_video_decoder.c	2008-12-02 08:38:30.000000000 +0000
-@@ -939,7 +939,7 @@
-               this->context->extradata_size);
-       }
-       
--      this->context->bits_per_sample = this->bih.biBitCount;
-+      this->context->bits_per_coded_sample = this->bih.biBitCount;
-             
-     } else {
-     
diff --git a/abs/core-testing/xine-lib/xine-header.patch b/abs/core-testing/xine-lib/xine-header.patch
deleted file mode 100644
index a37bfb9..0000000
--- a/abs/core-testing/xine-lib/xine-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xine-engine/buffer.h	2008-07-16 23:01:56.000000000 +0200
-+++ src/xine-engine/buffer.h	2008-08-24 21:14:39.000000000 +0200
-@@ -676,7 +676,7 @@
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
- 
diff --git a/abs/core-testing/xine-lib/xine-imagemagick.patch b/abs/core-testing/xine-lib/xine-imagemagick.patch
deleted file mode 100644
index 9faa4ab..0000000
--- a/abs/core-testing/xine-lib/xine-imagemagick.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xine-lib-1.1.15.orig/src/libxinevdec/image.c
-+++ xine-lib-1.1.15/src/libxinevdec/image.c
-@@ -110,7 +110,7 @@
-     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
-     height = MagickGetImageHeight(wand);
-     img_buf = malloc(width * height * 3);
--    MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-+    MagickGetAuthenticPixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-     DestroyMagickWand(wand);
- 
-     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
diff --git a/abs/core-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/abs/core-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e..0000000
--- a/abs/core-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
-                   ;;
- 
-               esac
--              if test x"$archopt_val" != x; then
--                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--              fi
-             fi
-           else
-             dnl we have the Intel compiler
diff --git a/abs/core-testing/xine-ui/ChangeLog b/abs/core-testing/xine-ui/ChangeLog
deleted file mode 100644
index e5fb3e8..0000000
--- a/abs/core-testing/xine-ui/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-08-19  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.5-4
-	* Added xine and xine-remote binaries (missing in 0.99.5-3)
-	* Added missing libxt makedepends
-	* Replaced .install file by an optdepends
-	* Added ChangeLog
diff --git a/abs/core-testing/xine-ui/PKGBUILD b/abs/core-testing/xine-ui/PKGBUILD
deleted file mode 100644
index 79ab3c3..0000000
--- a/abs/core-testing/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 9858 2008-08-19 23:56:23Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.5
-pkgrel=4
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://xinehq.de/"
-depends=('xine-lib' 'curl>=7.16.2' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libsm' 'libxxf86vm' 'ncurses>=5.6-7')
-makedepends=('lirc' 'libxt')
-optdepends=('lirc')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e643cd1fcad4d98a5ae4eb877ce5087b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  #add missing constant (defined in xine.h from xine-lib cvs)
-  echo '#define XINE_MSG_AUDIO_OUT_UNAVAILABLE 11' >> src/xitk/common.h
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-curses --with-x --enable-lirc --without-aalib
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  install -d ${pkgdir}/usr/share/applications
-  echo "Categories=Application;AudioVideo;" >> ${pkgdir}/usr/share/xine/desktop/xine.desktop
-  mv ${pkgdir}/usr/share/xine/desktop/xine.desktop ${pkgdir}/usr/share/applications
-}
diff --git a/abs/core-testing/atk/PKGBUILD b/abs/extra-testing/atk/PKGBUILD
index bca7854..bca7854 100644
--- a/abs/core-testing/atk/PKGBUILD
+++ b/abs/extra-testing/atk/PKGBUILD
diff --git a/abs/core-testing/fceu/PKGBUILD b/abs/extra-testing/fceu/PKGBUILD
index cdae29a..cdae29a 100755
--- a/abs/core-testing/fceu/PKGBUILD
+++ b/abs/extra-testing/fceu/PKGBUILD
diff --git a/abs/core-testing/frozen-bubble/PKGBUILD b/abs/extra-testing/frozen-bubble/PKGBUILD
index ca48827..ca48827 100644
--- a/abs/core-testing/frozen-bubble/PKGBUILD
+++ b/abs/extra-testing/frozen-bubble/PKGBUILD
diff --git a/abs/core-testing/frozen-bubble/frozen-bubble.desktop b/abs/extra-testing/frozen-bubble/frozen-bubble.desktop
index 6e53e5d..6e53e5d 100644
--- a/abs/core-testing/frozen-bubble/frozen-bubble.desktop
+++ b/abs/extra-testing/frozen-bubble/frozen-bubble.desktop
diff --git a/abs/core-testing/gconf/PKGBUILD b/abs/extra-testing/gconf/PKGBUILD
index 001c9e2..001c9e2 100644
--- a/abs/core-testing/gconf/PKGBUILD
+++ b/abs/extra-testing/gconf/PKGBUILD
diff --git a/abs/core-testing/gconf/gconf-merge-schema b/abs/extra-testing/gconf/gconf-merge-schema
index 323e0ec..323e0ec 100755
--- a/abs/core-testing/gconf/gconf-merge-schema
+++ b/abs/extra-testing/gconf/gconf-merge-schema
diff --git a/abs/core-testing/gconf/gconf-reload.patch b/abs/extra-testing/gconf/gconf-reload.patch
index 910f0da..910f0da 100644
--- a/abs/core-testing/gconf/gconf-reload.patch
+++ b/abs/extra-testing/gconf/gconf-reload.patch
diff --git a/abs/core-testing/gconf/gconf.install b/abs/extra-testing/gconf/gconf.install
index 7743def..7743def 100644
--- a/abs/core-testing/gconf/gconf.install
+++ b/abs/extra-testing/gconf/gconf.install
diff --git a/abs/core-testing/gconf/gconfpkg b/abs/extra-testing/gconf/gconfpkg
index a1ee6df..a1ee6df 100755
--- a/abs/core-testing/gconf/gconfpkg
+++ b/abs/extra-testing/gconf/gconfpkg
diff --git a/abs/core-testing/libidl2/PKGBUILD b/abs/extra-testing/libidl2/PKGBUILD
index 685801d..685801d 100644
--- a/abs/core-testing/libidl2/PKGBUILD
+++ b/abs/extra-testing/libidl2/PKGBUILD
diff --git a/abs/core-testing/libidl2/libidl2.install b/abs/extra-testing/libidl2/libidl2.install
index 38b3d56..38b3d56 100644
--- a/abs/core-testing/libidl2/libidl2.install
+++ b/abs/extra-testing/libidl2/libidl2.install
diff --git a/abs/core-testing/libmikmod/PKGBUILD b/abs/extra-testing/libmikmod/PKGBUILD
index eb124f3..eb124f3 100644
--- a/abs/core-testing/libmikmod/PKGBUILD
+++ b/abs/extra-testing/libmikmod/PKGBUILD
diff --git a/abs/core-testing/orbit2/PKGBUILD b/abs/extra-testing/orbit2/PKGBUILD
index e3fdf41..e3fdf41 100644
--- a/abs/core-testing/orbit2/PKGBUILD
+++ b/abs/extra-testing/orbit2/PKGBUILD
diff --git a/abs/core-testing/perl-yaml/PKGBUILD b/abs/extra-testing/perl-yaml/PKGBUILD
index b2e093c..b2e093c 100644
--- a/abs/core-testing/perl-yaml/PKGBUILD
+++ b/abs/extra-testing/perl-yaml/PKGBUILD
diff --git a/abs/core-testing/libcddb/PKGBUILD b/abs/extra-testing/quilt/libcddb/PKGBUILD
index 0435ab5..0435ab5 100644
--- a/abs/core-testing/libcddb/PKGBUILD
+++ b/abs/extra-testing/quilt/libcddb/PKGBUILD
diff --git a/abs/core-testing/libcdio/PKGBUILD b/abs/extra-testing/quilt/libcdio/PKGBUILD
index d3aaaa9..d3aaaa9 100644
--- a/abs/core-testing/libcdio/PKGBUILD
+++ b/abs/extra-testing/quilt/libcdio/PKGBUILD
diff --git a/abs/core-testing/libdvdcss/PKGBUILD b/abs/extra-testing/quilt/libdvdcss/PKGBUILD
index 9b5253e..9b5253e 100644
--- a/abs/core-testing/libdvdcss/PKGBUILD
+++ b/abs/extra-testing/quilt/libdvdcss/PKGBUILD
diff --git a/abs/core-testing/nmbscan/PKGBUILD b/abs/extra-testing/quilt/nmbscan/PKGBUILD
index 7b853d2..7b853d2 100755
--- a/abs/core-testing/nmbscan/PKGBUILD
+++ b/abs/extra-testing/quilt/nmbscan/PKGBUILD
diff --git a/abs/core-testing/sdl/PKGBUILD b/abs/extra-testing/quilt/sdl/PKGBUILD
index be6508a..be6508a 100644
--- a/abs/core-testing/sdl/PKGBUILD
+++ b/abs/extra-testing/quilt/sdl/PKGBUILD
diff --git a/abs/core-testing/vcdimager/PKGBUILD b/abs/extra-testing/quilt/vcdimager/PKGBUILD
index 1e59da6..1e59da6 100644
--- a/abs/core-testing/vcdimager/PKGBUILD
+++ b/abs/extra-testing/quilt/vcdimager/PKGBUILD
diff --git a/abs/core-testing/vcdimager/cdio.patch b/abs/extra-testing/quilt/vcdimager/cdio.patch
index f7f9e31..f7f9e31 100644
--- a/abs/core-testing/vcdimager/cdio.patch
+++ b/abs/extra-testing/quilt/vcdimager/cdio.patch
diff --git a/abs/core-testing/sdl_gfx/PKGBUILD b/abs/extra-testing/sdl_gfx/PKGBUILD
index 884a80b..884a80b 100644
--- a/abs/core-testing/sdl_gfx/PKGBUILD
+++ b/abs/extra-testing/sdl_gfx/PKGBUILD
diff --git a/abs/core-testing/sdl_image/PKGBUILD b/abs/extra-testing/sdl_image/PKGBUILD
index c9d29f2..c9d29f2 100644
--- a/abs/core-testing/sdl_image/PKGBUILD
+++ b/abs/extra-testing/sdl_image/PKGBUILD
diff --git a/abs/core-testing/sdl_image/SDL_image-IMG_lbm.patch b/abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch
index cc4a29b..cc4a29b 100644
--- a/abs/core-testing/sdl_image/SDL_image-IMG_lbm.patch
+++ b/abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch
diff --git a/abs/core-testing/sdl_image/SDL_image-buffer-overflow.patch b/abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch
index 0be82dc..0be82dc 100644
--- a/abs/core-testing/sdl_image/SDL_image-buffer-overflow.patch
+++ b/abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch
diff --git a/abs/core-testing/sdl_mixer/PKGBUILD b/abs/extra-testing/sdl_mixer/PKGBUILD
index 702532c..702532c 100644
--- a/abs/core-testing/sdl_mixer/PKGBUILD
+++ b/abs/extra-testing/sdl_mixer/PKGBUILD
diff --git a/abs/core-testing/sdl_net/PKGBUILD b/abs/extra-testing/sdl_net/PKGBUILD
index ac3073e..ac3073e 100644
--- a/abs/core-testing/sdl_net/PKGBUILD
+++ b/abs/extra-testing/sdl_net/PKGBUILD
diff --git a/abs/core-testing/sdl_pango/PKGBUILD b/abs/extra-testing/sdl_pango/PKGBUILD
index 705e900..705e900 100644
--- a/abs/core-testing/sdl_pango/PKGBUILD
+++ b/abs/extra-testing/sdl_pango/PKGBUILD
diff --git a/abs/core-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch b/abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
index 1535a56..1535a56 100644
--- a/abs/core-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
+++ b/abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
diff --git a/abs/core-testing/sdl_perl/PKGBUILD b/abs/extra-testing/sdl_perl/PKGBUILD
index 5824cd8..5824cd8 100644
--- a/abs/core-testing/sdl_perl/PKGBUILD
+++ b/abs/extra-testing/sdl_perl/PKGBUILD
diff --git a/abs/core-testing/sdl_sound/PKGBUILD b/abs/extra-testing/sdl_sound/PKGBUILD
index 87885c2..87885c2 100644
--- a/abs/core-testing/sdl_sound/PKGBUILD
+++ b/abs/extra-testing/sdl_sound/PKGBUILD
diff --git a/abs/core-testing/sdl_sound/flac.patch b/abs/extra-testing/sdl_sound/flac.patch
index d0ed491..d0ed491 100644
--- a/abs/core-testing/sdl_sound/flac.patch
+++ b/abs/extra-testing/sdl_sound/flac.patch
diff --git a/abs/core-testing/sdl_ttf/PKGBUILD b/abs/extra-testing/sdl_ttf/PKGBUILD
index 956b87f..956b87f 100644
--- a/abs/core-testing/sdl_ttf/PKGBUILD
+++ b/abs/extra-testing/sdl_ttf/PKGBUILD
diff --git a/abs/core-testing/sdlmame/ChangeLog b/abs/extra-testing/sdlmame/ChangeLog
index 872c595..872c595 100644
--- a/abs/core-testing/sdlmame/ChangeLog
+++ b/abs/extra-testing/sdlmame/ChangeLog
diff --git a/abs/core-testing/sdlmame/PKGBUILD b/abs/extra-testing/sdlmame/PKGBUILD
index 715f618..715f618 100644
--- a/abs/core-testing/sdlmame/PKGBUILD
+++ b/abs/extra-testing/sdlmame/PKGBUILD
diff --git a/abs/core-testing/sdlmame/extras.tar.gz b/abs/extra-testing/sdlmame/extras.tar.gz
index ae0bc2a..ae0bc2a 100644
--- a/abs/core-testing/sdlmame/extras.tar.gz
+++ b/abs/extra-testing/sdlmame/extras.tar.gz
diff --git a/abs/core-testing/sdlmame/sdlmame.install b/abs/extra-testing/sdlmame/sdlmame.install
index eedae49..eedae49 100644
--- a/abs/core-testing/sdlmame/sdlmame.install
+++ b/abs/extra-testing/sdlmame/sdlmame.install
diff --git a/abs/core-testing/sdlmame/sdlmame.sh b/abs/extra-testing/sdlmame/sdlmame.sh
index 38b4870..38b4870 100644
--- a/abs/core-testing/sdlmame/sdlmame.sh
+++ b/abs/extra-testing/sdlmame/sdlmame.sh
diff --git a/abs/core-testing/smpeg/PKGBUILD b/abs/extra-testing/smpeg/PKGBUILD
index 1b52434..1b52434 100644
--- a/abs/core-testing/smpeg/PKGBUILD
+++ b/abs/extra-testing/smpeg/PKGBUILD
diff --git a/abs/core-testing/smpeg/smpeg-0.4.4-gcc41.patch b/abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch
index 4a0eeb4..4a0eeb4 100644
--- a/abs/core-testing/smpeg/smpeg-0.4.4-gcc41.patch
+++ b/abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch
diff --git a/abs/core-testing/snes9x/PKGBUILD b/abs/extra-testing/snes9x/PKGBUILD
index 928081b..928081b 100644
--- a/abs/core-testing/snes9x/PKGBUILD
+++ b/abs/extra-testing/snes9x/PKGBUILD
diff --git a/abs/core-testing/snes9x/snes9x-fixes2.patch b/abs/extra-testing/snes9x/snes9x-fixes2.patch
index 6007bb6..6007bb6 100644
--- a/abs/core-testing/snes9x/snes9x-fixes2.patch
+++ b/abs/extra-testing/snes9x/snes9x-fixes2.patch
diff --git a/abs/core-testing/snes9x/snes9x.install b/abs/extra-testing/snes9x/snes9x.install
index 1528f50..1528f50 100755
--- a/abs/core-testing/snes9x/snes9x.install
+++ b/abs/extra-testing/snes9x/snes9x.install