Fix ffmpeg compilation

Modified submodules:

* src/ffmpeg a9d1337...f5138f4 (3):
  > CONFIG_FRSH_PROTOCOL is already defined by configure generated headers
  > Do not tell FFMPEG that the packet is bigger than current budget
  > Reworked assignment of FRSH contract parameters

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 015abcbd0773f0d6383733170bb5540062ac42d0..1e07ef939ec26c0b6bfdf9bd5bdf709fb1a33c35 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -1,3 +1,5 @@
+# -*- makefile-gmake -*-
+
 lib_LIBRARIES:=$(NAME)
 $(NAME)_SOURCES:=$(OBJS:%.o=%.c) $(OBJS-y:%.o=%.c) $(OBJS-yes:%.o=%.c)
 renamed_include_HEADERS = $(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
@@ -8,14 +10,15 @@ SUBDIRS = tools libavcodec libavdevice libavfilter libavformat       \
          libavutil libpostproc libswscale
 renamed_include_HEADERS=
 
-ifneq ($(CONFIG_FFMPEG_WITH_FRSH),y)
 bin_PROGRAMS = ffmpeg #pktdumper
-endif
 pktdumper_SOURCES = tools/pktdumper.c
 pktdumper_LIBS = avformat
 
 ffmpeg_SOURCES = ffmpeg.c cmdutils.c
 lib_LOADLIBES = $(ALLFFLIBS) $(FFEXTRALIBS:-l%=%)
+ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
+lib_LOADLIBES+= pthread rt fwp fna frsh
+endif
 endif
 
 ifeq ($(FFMPEG_SUBDIR),libavcodec)
@@ -33,5 +36,4 @@ ifeq ($(FFMPEG_SUBDIR),libavformat)
 HEADERS += os_support.h
 default_CONFIG += CONFIG_FFMPEG_WITH_FRSH=x
 LOCAL_CONFIG_H = libavformat_config.h
-$(NAME)_SOURCES += frsh.c
 endif

diff --git a/src/ffmpeg b/src/ffmpeg
index a9d1337e0ddde15598a5c383a41f39a4f57e6078..f5138f4f6306ec8e90b7939a954b36998896649c 160000 (submodule)
--- a/src/ffmpeg
+++ b/src/ffmpeg
@@ -1 +1 @@
-Subproject commit a9d1337e0ddde15598a5c383a41f39a4f57e6078
+Subproject commit f5138f4f6306ec8e90b7939a954b36998896649c