Commit 1408483d authored by Philippe Gorley's avatar Philippe Gorley Committed by Philippe Gorley

osxvideo: use avfoundation indev

Remove avfgrab and avfcapture patches, as their functionality is already
in FFmpeg with avfoundation.

Reduces the amount of code to maintain.

Change-Id: I6413821ad6d969dacf651c0fb7516c2499e89e07
Reviewed-by: default avatarAnthony Léonard <anthony.leonard@savoirfairelinux.com>
parent 26743109
This diff is collapsed.
This diff is collapsed.
......@@ -137,8 +137,7 @@ endif
ifdef HAVE_MACOSX
FFMPEGCONF += \
--enable-indev=avfcapture \
--enable-indev=avfgrab \
--enable-indev=avfoundation \
--enable-videotoolbox \
--enable-hwaccel=h263_videotoolbox \
--enable-hwaccel=h264_videotoolbox \
......@@ -208,10 +207,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
......
......@@ -97,7 +97,7 @@ VideoDeviceImpl::getDeviceParams() const
DeviceParams params;
params.name = [[avDevice_ localizedName] UTF8String];
params.input = device;
params.format = "avfcapture";
params.format = "avfoundation";
params.width = current_size_.first;
params.height = current_size_.second;
......
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