Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

ffmpeg: update

Browse Source 
git-svn-id: svn://kolibrios.org@6605 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2016-10-19 01:30:31 +00:00
parent 20a101806e
commit 08165419d8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
View File

@ -59,9 +59,9 @@ DLLTOOL=dlltool
WINDRES=windres WINDRES=windres
DEPWINDRES=gcc DEPWINDRES=gcc
DOXYGEN=doxygen 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= 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 '..@*' ASMSTRIPFLAGS= -wN '..@*'
YASMFLAGS=-f win32 -DPREFIX YASMFLAGS=-f win32 -DPREFIX
BUILDSUF= BUILDSUF=
@ -102,7 +102,7 @@ TARGET_SAMPLES=$(SAMPLES)
CFLAGS-ffplay= CFLAGS-ffplay=
ZLIB=-lz ZLIB=-lz
LIB_INSTALL_EXTRA_CMD=$$(RANLIB) "$(LIBDIR)/$(LIBNAME)" 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= COMPAT_OBJS=
EXEOBJS= EXEOBJS=
INSTALL=install INSTALL=install

2
contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavutil/time.c
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#define _GNU_SOURCE
#include "config.h" #include "config.h"
#include <stddef.h> #include <stddef.h>

2
contrib/sdk/sources/ffmpeg/ffmpeg-2.8/library.mak
View File

@ -62,7 +62,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
cd .. cd ..
mv -f $(SUBDIR)$(SLIBNAME_WITH_MAJOR) ../../../bin 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 ifdef SUBDIR