diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 13:53:11 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 14:04:30 +0200 |
| commit | b010843594fee88a791185b83684e0e725007b7b (patch) | |
| tree | d8153bc6faa8472878362c8b35910be5fe42893d /Makefile | |
| parent | cea5e7355c58004605321295b7a506052292dbbc (diff) | |
| parent | 122de16dd8108a59a55d30543c9f28b5f61b02d1 (diff) | |
| download | ffmpeg-streaming-b010843594fee88a791185b83684e0e725007b7b.zip ffmpeg-streaming-b010843594fee88a791185b83684e0e725007b7b.tar.gz | |
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-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |
