From 08165419d8414bbf435f8457106e59225c1e633d Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Wed, 19 Oct 2016 01:30:31 +0000
Subject: [PATCH] ffmpeg: update

git-svn-id: svn://kolibrios.org@6605 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak       | 6 +++---
 contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c | 2 ++
 contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
index bd5edcc0e5..12863a730d 100644
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
@@ -59,9 +59,9 @@ DLLTOOL=dlltool
 WINDRES=windres
 DEPWINDRES=gcc
 DOXYGEN=doxygen
-LDFLAGS=-L../../../lib -L/home/autobuild/tools/win32/mingw32/lib --output-def $$(@:$(SLIBSUF)=.orig.def) -nostdlib --enable-runtime-pseudo-reloc
+LDFLAGS= --output-def $$(@:$(SLIBSUF)=.orig.def) --enable-runtime-pseudo-reloc
 LDEXEFLAGS=
-SHFLAGS=-shared -s -T../../newlib/dll.lds -Bsymbolic --entry _DllStartup --image-base 0 --out-implib $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) --version-script $(SUBDIR)lib$(NAME).ver -ldll
+SHFLAGS=-shared -s -T dll.lds -Bsymbolic --entry _DllStartup --image-base 0 --out-implib $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) --version-script $(SUBDIR)lib$(NAME).ver -ldll
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=-f win32  -DPREFIX
 BUILDSUF=
@@ -102,7 +102,7 @@ TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
 ZLIB=-lz
 LIB_INSTALL_EXTRA_CMD=$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"
-EXTRALIBS=-ldll -lz.dll -lva.dll -lc.dll -lgcc
+EXTRALIBS=-ldll -lz.dll -lva.dll -lgcc -lc.dll
 COMPAT_OBJS=
 EXEOBJS=
 INSTALL=install
diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c
index b1cb7fc55d..6d3a6756d9 100644
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _GNU_SOURCE
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak
index 5f07923402..4287c08be2 100644
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak
@@ -62,7 +62,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 	cd ..
 	mv -f $(SUBDIR)$(SLIBNAME_WITH_MAJOR) ../../../bin
-	mv -f $(SUBDIR)lib$(SLIBNAME).a ../../../lib
+	mv -f $(SUBDIR)lib$(SLIBNAME).a /home/autobuild/tools/win32/lib
 
 
 ifdef SUBDIR