virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

* BeOS patch by François Revol <revol@free.fr>

Browse Source 
fixing some compilation problems

Originally committed as revision 319 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol 2002-03-08 09:09:57 +00:00 committed by Zdenek Kabelac
parent 73c8e5144a
commit ef0bc4c97f
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -33,10 +33,10 @@ lib:
$(MAKE) -C libav all $(MAKE) -C libav all
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB) ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB) $(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB) ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB) $(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
ffplay: ffmpeg$(EXE) ffplay: ffmpeg$(EXE)
ln -sf $< $@ ln -sf $< $@

23
configure vendored
View File

@ -27,7 +27,7 @@ cc="gcc"
ar="ar" ar="ar"
cpu=`uname -m` cpu=`uname -m`
case "$cpu" in case "$cpu" in
i386|i486|i586|i686|i86pc) i386|i486|i586|i686|i86pc|BePC)
cpu="x86" cpu="x86"
mmx="yes" mmx="yes"
;; ;;
@ -46,6 +46,26 @@ esac
gprof="no" gprof="no"
grab="yes" grab="yes"
win32="no" win32="no"
extralibs="-lm"
# OS specific
targetos=`uname -s`
case $targetos in
BeOS)
prefix="/boot/home/config"
# helps building libavcodec
grab="no"
CFLAGS="-O2 -DPIC"
# no need for libm, but the inet stuff
# Check for BONE
if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
extralibs="-lbind -lsocket"
else
echo "Not sure building for net_server will succeed... good luck."
extralibs="-lsocket"
fi ;;
*) ;;
esac
if [ "$1" = "-h" -o "$1" = "--help" ] ; then if [ "$1" = "-h" -o "$1" = "--help" ] ; then
cat << EOF cat << EOF
@ -167,6 +187,7 @@ if [ "$lshared" = "yes" ] ; then
else else
echo "BUILD_SHARED=no" >> config.mak echo "BUILD_SHARED=no" >> config.mak
fi fi
echo "EXTRALIBS=$extralibs" >> config.mak
echo -n "VERSION=" >>config.mak echo -n "VERSION=" >>config.mak
head VERSION >>config.mak head VERSION >>config.mak
echo "" >>config.mak echo "" >>config.mak

2
ffmpeg.c
View File

@ -1801,6 +1801,7 @@ void prepare_grab(void)
/* open the necessary output devices for playing */ /* open the necessary output devices for playing */
void prepare_play(void) void prepare_play(void)
{ {
#ifndef __BEOS__
file_format = guess_format("audio_device", NULL, NULL); file_format = guess_format("audio_device", NULL, NULL);
if (!file_format) { if (!file_format) {
fprintf(stderr, "Could not find audio device\n"); fprintf(stderr, "Could not find audio device\n");
@ -1808,6 +1809,7 @@ void prepare_play(void)
} }
opt_output_file(audio_device); opt_output_file(audio_device);
#endif
} }