Commit 0df260ed authored by Adrien Béraud's avatar Adrien Béraud

Revert "contrib: bump ffmpeg"

This reverts commit c82ce077.

Change-Id: If5a80729bd4d2b3061e37e352268198c2fa5c9ab
parent c82ce077
FFMPEG_HASH := a149fa97d9501d3a1749232cc60b6f122d9d2de8
FFMPEG_HASH := n3.3.3
FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz
PKGS+=ffmpeg
ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libswscale >= 4.7.103"),)
ifeq ($(call need_pkg,"libavutil >= 55.58.100 libavcodec >= 57.89.100 libavformat >= 57.71.100 libavdevice >= 57.6.100 libswscale >= 4.6.100"),)
PKGS_FOUND += ffmpeg
endif
......@@ -20,7 +20,8 @@ FFMPEGCONF += \
--enable-gpl \
--enable-swscale \
--enable-protocols \
--disable-programs
--disable-programs \
--disable-sdl
#enable muxers/demuxers
FFMPEGCONF += \
......@@ -134,10 +135,14 @@ 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-hwaccel=mpeg4_videotoolbox \
--enable-vda \
--enable-hwaccel=h264_vda
endif
ifdef HAVE_IOS
......@@ -145,7 +150,8 @@ FFMPEGCONF += \
--target-os=darwin \
--enable-cross-compile \
--arch=$(ARCH) \
--enable-pic
--enable-pic \
--enable-indev=avfoundation
endif
ifndef HAVE_IOS
......@@ -202,6 +208,10 @@ 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment