Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffmpeg: Update to ffmpeg 3.0.1 and Kodi upstream #77

Merged
merged 2 commits into from
Apr 18, 2016
Merged

ffmpeg: Update to ffmpeg 3.0.1 and Kodi upstream #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93c0330
dcadec: Package no longer required, included in ffmpeg3
MilhouseVH Apr 1, 2016
6b10486
ffmpeg: Update to 3.0.1 (Kodi 17)
MilhouseVH Apr 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions packages/audio/dcadec/package.mk
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions packages/multimedia/ffmpeg/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
################################################################################

PKG_NAME="ffmpeg"
PKG_VERSION="2.8.6"
PKG_VERSION="3.0-xbmc"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPLv2.1+"
PKG_SITE="https://ffmpeg.org"
PKG_URL="https://ffmpeg.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl dcadec speex"
PKG_URL="https://github.com/xbmc/FFmpeg/archive/release/${PKG_VERSION}.tar.gz"
PKG_SOURCE_DIR="FFmpeg-release-${PKG_VERSION}"
PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl speex"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
Expand Down Expand Up @@ -194,7 +195,6 @@ configure_target() {
--disable-libopencore-amrwb \
--disable-libopencv \
--disable-libdc1394 \
--enable-libdcadec \
--disable-libfaac \
--disable-libfreetype \
--disable-libgsm \
Expand All @@ -205,7 +205,6 @@ configure_target() {
--disable-libschroedinger \
--enable-libspeex \
--disable-libtheora \
--disable-libvo-aacenc \
--disable-libvo-amrwbenc \
--enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
--disable-libvpx \
Expand Down
Loading