From 32795f337d8293ad747ef0955e6624c9c1a6f01a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 21 Mar 2012 03:22:39 +0100
Subject: [PATCH] libav: update to libav-0.8.1, rebuild for addon version 2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/multimedia/libav/addon         | 4 ++--
 packages/addons/multimedia/libav/build         | 3 ---
 packages/addons/multimedia/libav/changelog.txt | 4 ++++
 packages/addons/multimedia/libav/meta          | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/addons/multimedia/libav/addon b/packages/addons/multimedia/libav/addon
index fa8e65d4e3..a82e88d443 100755
--- a/packages/addons/multimedia/libav/addon
+++ b/packages/addons/multimedia/libav/addon
@@ -24,7 +24,7 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/ffplay $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/avplay $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
-  cp $PKG_BUILD/ffpresets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
+  cp $PKG_BUILD/presets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
diff --git a/packages/addons/multimedia/libav/build b/packages/addons/multimedia/libav/build
index e054024572..c56706db66 100755
--- a/packages/addons/multimedia/libav/build
+++ b/packages/addons/multimedia/libav/build
@@ -71,9 +71,6 @@ cd $PKG_BUILD/
             --enable-logging \
             --enable-doc \
             --enable-ffmpeg \
-            --enable-ffplay \
-            --disable-ffprobe \
-            --disable-ffserver \
             --enable-avdevice \
             --enable-avcodec \
             --enable-avformat \
diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt
index ab5bf9410a..7d23f2e6a8 100644
--- a/packages/addons/multimedia/libav/changelog.txt
+++ b/packages/addons/multimedia/libav/changelog.txt
@@ -1,3 +1,7 @@
+2.1.1
+- update to addon version 2.1
+- update to libav-0.8.1
+
 2.0.2
 - add 'x11grab' input support
 
diff --git a/packages/addons/multimedia/libav/meta b/packages/addons/multimedia/libav/meta
index 646fe9233a..fc64ff3622 100644
--- a/packages/addons/multimedia/libav/meta
+++ b/packages/addons/multimedia/libav/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="libav"
-PKG_VERSION="0.7.2"
-PKG_REV="2"
+PKG_VERSION="0.8.1"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"