diff -ru a/external/FFmpeg/Makefile b/external/FFmpeg/Makefile
a
|
b
|
|
33 | 33 | |
34 | 34 | FFLIBS := avutil |
35 | 35 | |
36 | | DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) |
| 36 | DATA_FILES := $(wildcard $(SRC_PATH_BARE)/external/FFmpeg/ffpresets/*.ffpreset) |
37 | 37 | |
38 | 38 | SKIPHEADERS = cmdutils_common_opts.h |
39 | 39 | |
… |
… |
|
58 | 58 | $(STRIP) $@ |
59 | 59 | |
60 | 60 | config.h: .config |
61 | | .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) |
| 61 | .config: $(wildcard $(FFLIBS:%=$(SRC_PATH_BARE)/external/FFmpeg/lib%/all*.c)) |
62 | 62 | @-tput bold 2>/dev/null |
63 | 63 | @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' |
64 | 64 | @-tput sgr0 2>/dev/null |
diff -ru a/external/FFmpeg/version.sh b/external/FFmpeg/version.sh
a
|
b
|
|
26 | 26 | test $revision || revision=UNKNOWN |
27 | 27 | |
28 | 28 | # releases extract the version number from the VERSION file |
29 | | version=$(cd "$1" && cat VERSION 2> /dev/null) |
| 29 | version=$(. "$1/VERSION" 2> /dev/null && echo "$SOURCE_VERSION") |
30 | 30 | test $version || version=$revision |
31 | 31 | |
32 | 32 | test -n "$3" && version=$version-$3 |