jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: fix conflict leftovers

Browse Source
This commit is contained in:
Calin Crisan 2017-10-08 16:33:04 +03:00
parent b8a91f0174
commit 6b41e13e1d
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/ffmpeg/ffmpeg.mk
View File

@ -490,15 +490,6 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
endif endif
<<<<<<< HEAD
ifeq ($(BR2_PACKAGE_FFMPEG_RPI_HW_CODECS),y)
FFMPEG_DEPENDENCIES += rpi-userland
FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi --enable-mmal --extra-cflags=-I../../staging/usr/include/IL/
endif
=======
>>>>>>> thingos
FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others