diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2014-08-03 00:11:17 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-03 10:22:23 +0200 |
| commit | bf76f4319131a107b2dd4ee5ee1eb703825ddbed (patch) | |
| tree | 2b92224f698e9c98e54667ce365199060167b2af /package/ffmpeg | |
| parent | 72b32d5197d4227ce80339388849fe39a996e441 (diff) | |
| download | buildroot-bf76f4319131a107b2dd4ee5ee1eb703825ddbed.tar.gz buildroot-bf76f4319131a107b2dd4ee5ee1eb703825ddbed.zip | |
package/ffmpeg: Bump to version 2.3.1
- remove obsolete option --disable-vis
- add patch to fix compile error with uClibc
- add patch to fix compile error in freerdp
Compile-tested against all packages depending on ffmpeg using this defconfig:
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_FFMPEG=y
BR2_PACKAGE_MPD=y
BR2_PACKAGE_MPD_FFMPEG=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_FREERDP=y
BR2_PACKAGE_OPENCV=y
BR2_PACKAGE_OPENCV_WITH_FFMPEG=y
BR2_PACKAGE_MEDIASTREAMER=y
BR2_PACKAGE_MINIDLNA=y
VLC also compiled when the build of vlc-static is disabled in Makefiles,
otherwise this known error occurs:
http://autobuild.buildroot.net/results/022/022252176c051ff3365b2cb820f32aafc802803a/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/ffmpeg-0001-fminf.patch | 47 | ||||
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 3 |
2 files changed, 48 insertions, 2 deletions
diff --git a/package/ffmpeg/ffmpeg-0001-fminf.patch b/package/ffmpeg/ffmpeg-0001-fminf.patch new file mode 100644 index 0000000000..1e08517456 --- /dev/null +++ b/package/ffmpeg/ffmpeg-0001-fminf.patch @@ -0,0 +1,47 @@ +Fix build error + +CC libavdevice/alldevices.o +In file included from ./libavutil/internal.h:167:0, + from ./libavutil/common.h:415, + from ./libavutil/avutil.h:289, + from ./libavutil/log.h:25, + from libavdevice/avdevice.h:46, + from libavdevice/alldevices.c:22: +./libavutil/libm.h:87:40: error: static declaration of 'fminf' follows non-static declaration + static av_always_inline av_const float fminf(float x, float y) + ^ +make: *** [libavdevice/alldevices.o] Error 1 + +using buildroot-compiled uClibc toolchain, used defconfig: + +BR2_x86_64=y +BR2_x86_corei7=y +BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y +BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y +BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> + + +diff -uNr ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c.org/libavutil/libm.h ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c/libavutil/libm.h +--- ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c.org/libavutil/libm.h 2014-07-16 20:37:20.000000000 +0200 ++++ ffmpeg-d028c907004e8a3c0f5161ce595331e4cc57c86c/libavutil/libm.h 2014-07-17 22:58:01.781316442 +0200 +@@ -82,16 +82,6 @@ + #define exp2f(x) ((float)exp2(x)) + #endif /* HAVE_EXP2F */ + +-#if !HAVE_FMINF +-#undef fminf +-static av_always_inline av_const float fminf(float x, float y) +-{ +- //Note, the NaN special case is needed for C spec compliance, it should be +- //optimized away if the users compiler is configured to assume no NaN +- return x > y ? y : (x == x ? x : y); +-} +-#endif +- + #if !HAVE_ISINF + static av_always_inline av_const int isinf(float x) + { diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 2b73fbc7e1..5c269acb3b 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 1.2.7 +FFMPEG_VERSION = 2.3.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -65,7 +65,6 @@ FFMPEG_CONF_OPT = \ --disable-libtheora \ --disable-libvo-aacenc \ --disable-libvo-amrwbenc \ - --disable-vis \ --disable-sram \ --disable-symver \ --disable-doc |
