diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:20:09 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:22:48 +0300 |
| commit | e15e78f391abf4e037352cd783f6fa3c6b843d94 (patch) | |
| tree | bc2b1e5e48a071f56f1cdcc4e40cfc11ded77d53 /Makefile | |
| parent | 2778fdbe5424485d135a37d384d6449113a6c2b5 (diff) | |
| parent | 1316df7aa98c4784f190d107206d0bb12c590b89 (diff) | |
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
lavu: add an API function to return the Libav version string
Conflicts:
.gitignore
Makefile
cmdutils.c
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c
See: f91126643a91c2d3f8d8e210c8facaf259951b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -175,7 +175,7 @@ clean:: distclean:: $(RM) $(DISTCLEANSUFFIXES) - $(RM) config.* .config libavutil/avconfig.h .version version.h libavutil/ffversion.h libavcodec/codec_names.h + $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h config: $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) |