highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'

Browse Source 
* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
  Replace cmdutils_common_opts.h by a macro

Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
Clément Bœsch
2017-05-05 13:53:11 +02:00
parent cea5e7355c 122de16dd8
commit b010843594
8 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -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