From 7747a97c7542b708e6c82867b0a84aeec828a704 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 24 Dec 2014 06:20:10 -0600
Subject: update to latest upstream, disable iconv

---
 package/ffmpeg/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package/ffmpeg')

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 2a372a564..26c882b11 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.4.3
+PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8da635baff57d7ab704b1daca5a99b47
 PKG_DESCR:=		record, convert and stream audio & video
@@ -132,6 +132,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-bzlib \
 			--disable-doc \
 			--disable-debug \
+			--disable-iconv \
 			--disable-yasm \
 			--disable-optimizations \
 			--disable-stripping \
-- 
cgit v1.2.3