From 6b41e13e1d13fb233415c09432ed57f51fb14c99 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 8 Oct 2017 16:33:04 +0300
Subject: [PATCH] ffmpeg: fix conflict leftovers

---
 package/ffmpeg/ffmpeg.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 14b4e35434..801615c077 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -490,15 +490,6 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
 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))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others