jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

contrib: bump ffmpeg

Browse Source 
Brings many bug fixes, optimizations, and better abstraction of the
hardware decoding API. Removes VDA, as it is no longer supported in
FFmpeg and is deprecated by Apple. Also removes AVF patches; they are
already implemented in FFmpeg.

Change-Id: I15629531ad91296e77c16ec218b2bb6de5a705ba
This commit is contained in:
philippegorley
2017-09-18 09:44:05 -04:00
committed by Adrien Béraud
parent b9468addb2
commit c82ce0776c
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/src/ffmpeg/rules.mak
View File

@ -1,9 +1,9 @@
FFMPEG_HASH := n3.3.3
FFMPEG_HASH := a149fa97d9501d3a1749232cc60b6f122d9d2de8
FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz
PKGS+=ffmpeg
ifeq ($(call need_pkg,"libavutil >= 55.58.100 libavcodec >= 57.89.100 libavformat >= 57.71.100 libavdevice >= 57.6.100 libswscale >= 4.6.100"),)
ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libswscale >= 4.7.103"),)
PKGS_FOUND += ffmpeg
endif
@ -20,8 +20,7 @@ FFMPEGCONF += \
--enable-gpl \
--enable-swscale \
--enable-protocols \
--disable-programs \
--disable-sdl
--disable-programs
#enable muxers/demuxers
FFMPEGCONF += \
@ -135,14 +134,10 @@ endif
ifdef HAVE_MACOSX
FFMPEGCONF += \
--enable-indev=avfcapture \
--enable-indev=avfgrab \
--enable-videotoolbox \
--enable-hwaccel=h263_videotoolbox \
--enable-hwaccel=h264_videotoolbox \
--enable-hwaccel=mpeg4_videotoolbox \
--enable-vda \
--enable-hwaccel=h264_vda
--enable-hwaccel=mpeg4_videotoolbox
endif
ifdef HAVE_IOS
@ -150,8 +145,7 @@ FFMPEGCONF += \
--target-os=darwin \
--enable-cross-compile \
--arch=$(ARCH) \
--enable-pic \
--enable-indev=avfoundation
--enable-pic
endif
ifndef HAVE_IOS
@ -208,10 +202,6 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.gz .sum-ffmpeg
mkdir -p $@-$(FFMPEG_HASH)
(cd $@-$(FFMPEG_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<)
$(UPDATE_AUTOCONFIG)
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/ffmpeg/0004-add-avfcapture-device.patch
$(APPLY) $(SRC)/ffmpeg/0005-add-avfgrab-device.patch
endif
ifdef HAVE_ANDROID
ifeq ($(ARCH),arm)
$(APPLY) $(SRC)/ffmpeg/0001-use-internal-log2-log2f.patch