Commit 4e4a609d authored by Alexandre Lision's avatar Alexandre Lision Committed by gerrit2

Revert "video: use ffmpeg on OSX"

- libav is still selected when building the daemon
- patch 0005-add-avfgrab-device.patch does not compile
- video does not work with the avfcapture device

This reverts commit 762ce5d1.

Change-Id: Iebe59520877bbcd8fb9e8581341ff77be6d326b0
parent 4eda26c3
This diff is collapsed.
This diff is collapsed.
......@@ -86,8 +86,6 @@ FFMPEGCONF += \
--enable-encoder=tiff \
--enable-decoder=tiff
DEPS_ffmpeg = iconv zlib x264 vpx opus speex $(DEPS_vpx)
ifdef HAVE_WIN32
FFMPEGCONF += \
--enable-indev=dshow \
......@@ -194,8 +192,6 @@ ifdef HAVE_IOS
endif
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/ffmpeg/clock_gettime.patch
$(APPLY) $(SRC)/ffmpeg/0004-add-avfcapture-device.patch
$(APPLY) $(SRC)/ffmpeg/0005-add-avfgrab-device.patch
endif
$(MOVE)
......
......@@ -96,8 +96,8 @@ VideoDeviceImpl::getDeviceParams() const
{
DeviceParams params;
params.name = [[avDevice_ localizedName] UTF8String];
params.input = device;
params.format = "avfcapture";
params.input = "[" + device + "]";
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