update ffmpeg

package/ffmpeg/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.0.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		6c5cfed204d8a108325d1fc439ab734a
+PKG_VERSION:=		2.1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2719ab2b3311ac3775b9cdeb66c54849
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
@@ -132,6 +132,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--cross-prefix=${TARGET_CROSS} \
 			--cc='$(TARGET_CC)' \
 			--host-cc=$(CC_FOR_BUILD) \
+			--disable-bzlib \
 			--disable-doc \
 			--disable-debug \
 			--disable-yasm \

package/ffmpeg/patches/patch-libavcodec_arm_Makefile

@@ -1,12 +0,0 @@
---- ffmpeg-2.0.1.orig/libavcodec/arm/Makefile	2013-08-11 01:23:24.000000000 +0200
-+++ ffmpeg-2.0.1/libavcodec/arm/Makefile	2013-10-14 17:47:19.000000000 +0200
-@@ -52,7 +52,8 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER)       +
-                                           arm/vp8dsp_init_armv6.o       \
-                                           arm/vp8dsp_armv6.o
- 
--VFP-OBJS-$(HAVE_ARMV6)                 += arm/fmtconvert_vfp.o
-+VFP-OBJS-$(HAVE_ARMV6)                 += arm/fmtconvert_vfp.o \
-+					  arm/synth_filter_vfp.o	
- 
- NEON-OBJS                              += arm/fmtconvert_neon.o
- 

package/ffmpeg/patches/patch-libavcodec_arm_fft_init_arm_c

@@ -1,25 +0,0 @@
---- ffmpeg-2.0.2.orig/libavcodec/arm/fft_init_arm.c	2013-10-08 19:52:31.000000000 +0200
-+++ ffmpeg-2.0.2/libavcodec/arm/fft_init_arm.c	2013-10-16 12:59:04.000000000 +0200
-@@ -32,6 +32,12 @@ void ff_mdct_calc_neon(FFTContext *s, FF
- 
- void ff_rdft_calc_neon(struct RDFTContext *s, FFTSample *z);
- 
-+void ff_synth_filter_float_vfp(FFTContext *imdct,
-+                               float *synth_buf_ptr, int *synth_buf_offset,
-+                               float synth_buf2[32], const float window[512],
-+                               float out[32], const float in[32],
-+                               float scale);
-+
- void ff_synth_filter_float_neon(FFTContext *imdct,
-                                 float *synth_buf_ptr, int *synth_buf_offset,
-                                 float synth_buf2[32], const float window[512],
-@@ -71,6 +77,9 @@ av_cold void ff_synth_filter_init_arm(Sy
- {
-     int cpu_flags = av_get_cpu_flags();
- 
-+    if (have_vfp(cpu_flags))
-+        s->synth_filter_float = ff_synth_filter_float_vfp;
-+
-     if (have_neon(cpu_flags))
-         s->synth_filter_float = ff_synth_filter_float_neon;
- }