git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
added ffserver disabling for easier porting
[ffmpeg.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
afa613c
..
a954e0e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-19,7
+19,10
@@
EXE=.exe
PROG=ffmpeg$(EXE)
else
EXT=
-PROG=ffmpeg ffplay ffserver
+PROG=ffmpeg ffplay
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver
+endif
endif
ifeq ($(CONFIG_AUDIO_BEOS),yes)