diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 10:49:41 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 10:49:41 +0200 |
| commit | e99d1f38b6afb63d16464452d8c65258cbdc66aa (patch) | |
| tree | e5043b0f7d05b8c28d0093d92db6535c5ccbce09 /package/ffmpeg | |
| parent | 82949d243f9451a8495609995a8a71a2a153ac08 (diff) | |
update to latest stable version
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/Makefile | 6 | ||||
| -rw-r--r-- | package/ffmpeg/patches/patch-configure | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 99b5cb558..bedb412b9 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 0.10 -PKG_RELEASE:= 2 -PKG_MD5SUM:= dc665cc599a739e3c5262ccdac13d129 +PKG_VERSION:= 2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 13a0feb74474f89052f6b8ba1bce46be PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure deleted file mode 100644 index a2b80f82c..000000000 --- a/package/ffmpeg/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- ffmpeg-0.8.3.orig/configure 2011-09-07 15:34:40.000000000 +0200 -+++ ffmpeg-0.8.3/configure 2011-09-16 05:19:35.928726043 +0200 -@@ -2947,7 +2947,7 @@ enabled libxavs && require libxavs x - enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore - enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib - --SDL_CONFIG="${cross_prefix}sdl-config" -+SDL_CONFIG="${sysroot}/usr/bin/sdl-config" - if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then - check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && - enable sdl && |