generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied changes to make it compile on darwin

Browse Source 
Originally committed as revision 1270 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philip Gladstone 2002-11-23 01:29:25 +00:00
parent 9c76bd48aa
commit 47930f093e
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,8 +48,10 @@ ifeq ($(BUILD_VHOOK),yes)
VHOOK=videohook VHOOK=videohook
INSTALLVHOOK=install-vhook INSTALLVHOOK=install-vhook
CLEANVHOOK=clean-vhook CLEANVHOOK=clean-vhook
ifneq ($(CONFIG_DARWIN),yes)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
endif endif
endif
OBJS = ffmpeg.o ffserver.o OBJS = ffmpeg.o ffserver.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)

9
configure vendored
View File

@ -114,6 +114,7 @@ CFLAGS="-no-cpp-precomp -pipe -O3 -fomit-frame-pointer -mdynamic-no-pic"
SHFLAGS="-dynamiclib" SHFLAGS="-dynamiclib"
extralibs="" extralibs=""
darwin="yes" darwin="yes"
strip="strip -x"
;; ;;
CYGWIN*) CYGWIN*)
v4l="no" v4l="no"
@ -145,7 +146,7 @@ int main( void ) { return (int) dlopen("foo", 0); }
EOF EOF
if $cc -o $TMPO $TMPC -ldl 2> /dev/null ; then if $cc -o $TMPO $TMPC -ldl 2> /dev/null ; then
: vhook=yes vhook=yes
fi fi
cat > $TMPC << EOF cat > $TMPC << EOF
@ -421,7 +422,7 @@ echo " --disable-v4l disable video4linux grabbing [default=no]"
echo " --disable-network disable network support [default=no]" echo " --disable-network disable network support [default=no]"
echo " --disable-zlib disable zlib [default=no]" echo " --disable-zlib disable zlib [default=no]"
echo " --disable-simple_idct disable simple IDCT routines [default=no]" echo " --disable-simple_idct disable simple IDCT routines [default=no]"
# echo " --disable-vhook disable video hooking support" echo " --disable-vhook disable video hooking support"
echo " --enable-gprof enable profiling with gprof [$gprof]" echo " --enable-gprof enable profiling with gprof [$gprof]"
echo " --disable-mpegaudio-hp faster (but less accurate)" echo " --disable-mpegaudio-hp faster (but less accurate)"
echo " mpegaudio decoding [default=no]" echo " mpegaudio decoding [default=no]"
@ -451,10 +452,10 @@ echo "mp3lame enabled $mp3lame"
echo "vorbis enabled $vorbis" echo "vorbis enabled $vorbis"
echo "a52 support $a52" echo "a52 support $a52"
echo "a52 dlopened $a52bin" echo "a52 dlopened $a52bin"
# echo "Video hooking $vhook" echo "Video hooking $vhook"
if test "$vhook" = "yes" ; then if test "$vhook" = "yes" ; then
: echo "Imlib2 support $imlib2" echo "Imlib2 support $imlib2"
fi fi
echo "Creating config.mak and config.h" echo "Creating config.mak and config.h"

9
vhook/Makefile
View File

@ -2,6 +2,11 @@ include ../config.mak
CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libav -I../libavcodec -DHAVE_AV_CONFIG_H CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libav -I../libavcodec -DHAVE_AV_CONFIG_H
ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+=-bundle -flat_namespace -undefined suppress
else
LDFLAGS+=-shared
endif
HOOKS=null.so fish.so HOOKS=null.so fish.so
ifeq ($(HAVE_IMLIB2),yes) ifeq ($(HAVE_IMLIB2),yes)
@ -14,11 +19,11 @@ install:
install -s -m 755 $(HOOKS) $(INSTDIR) install -s -m 755 $(HOOKS) $(INSTDIR)
imlib2.so: imlib2.o imlib2.so: imlib2.o
$(CC) -g -o $@ -shared $< -lImlib2 $(CC) -g -o $@ $(LDFLAGS) $< -lImlib2
rm $< rm $<
%.so: %.o %.so: %.o
$(CC) -g -o $@ -shared $< $(CC) -g -o $@ $(LDFLAGS) $<
%.html: %.texi %.html: %.texi
texi2html -monolithic -number $< texi2html -monolithic -number $<

2
vhook/fish.c
View File

@ -35,7 +35,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <sys/time.h> #include <sys/time.h>

1
vhook/imlib2.c
View File

@ -45,7 +45,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>