Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-05-05 14:53:11 +0300
committerClément Bœsch <cboesch@gopro.com>2017-05-05 15:04:30 +0300
commitb010843594fee88a791185b83684e0e725007b7b (patch)
treed8153bc6faa8472878362c8b35910be5fe42893d /Makefile
parentcea5e7355c58004605321295b7a506052292dbbc (diff)
parent122de16dd8108a59a55d30543c9f28b5f61b02d1 (diff)
Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'
* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1': Replace cmdutils_common_opts.h by a macro Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0122e1628f..d414cf841e 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,7 @@ FFLIBS := avutil
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README
-SKIPHEADERS = cmdutils_common_opts.h \
- compat/w32pthreads.h
+SKIPHEADERS = compat/w32pthreads.h
# first so "all" becomes default target
all: all-yes