From 5a63403a09aa19f83396a76930e9f98805467b74 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 5 Jun 2012 07:51:45 +0200
Subject: [PATCH] ffmpeg: move to packages/multimedia/, complete rework to
 match xbmc's internal setup, add patches from xbmc, add xvba support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/lib/ffmpeg/build | 65 ------------------------------
 packages/3rdparty/lib/ffmpeg/meta  | 35 ----------------
 2 files changed, 100 deletions(-)
 delete mode 100755 packages/3rdparty/lib/ffmpeg/build
 delete mode 100644 packages/3rdparty/lib/ffmpeg/meta

diff --git a/packages/3rdparty/lib/ffmpeg/build b/packages/3rdparty/lib/ffmpeg/build
deleted file mode 100755
index 5d1ea5dbf0..0000000000
--- a/packages/3rdparty/lib/ffmpeg/build
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-./configure --prefix=/usr \
-            --cross-prefix=$TARGET_PREFIX \
-            --arch=$TARGET_ARCH \
-            --cpu=$TARGET_CPU \
-            --sysroot=$SYSROOT_PREFIX \
-            --sysinclude="$SYSROOT_PREFIX/usr/include" \
-            --nm="$NM" \
-            --ar="$AR" \
-            --as="$CC" \
-            --cc="$CC" \
-            --ld="$CC" \
-            --host-cc="$HOST_CC" \
-            --host-cflags="$HOST_CFLAGS" \
-            --host-ldflags="$HOST_LDFLAGS" \
-            --host-libs="" \
-            --extra-cflags="$CFLAGS" \
-            --extra-ldflags="$LDFLAGS" \
-            --build-suffix="" \
-            --target-os="linux" \
-            --enable-cross-compile \
-            --disable-static \
-            --enable-shared \
-            --disable-ffmpeg \
-            --disable-ffplay \
-            --disable-ffprobe \
-            --disable-ffserver \
-            --enable-gpl \
-            --enable-postproc \
-            --enable-swscale \
-            --enable-avfilter \
-            --enable-pthreads \
-            --disable-debug \
-            --enable-runtime-cpudetect \
-            --disable-crystalhd \
-            --enable-vdpau \
-            --disable-vaapi
-
-make
-$MAKEINSTALL
diff --git a/packages/3rdparty/lib/ffmpeg/meta b/packages/3rdparty/lib/ffmpeg/meta
deleted file mode 100644
index 49f3fb3e36..0000000000
--- a/packages/3rdparty/lib/ffmpeg/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ffmpeg"
-PKG_VERSION="0.10.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://ffmpeg.org"
-PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
-PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"