diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:20:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:22:48 +0200 |
| commit | e15e78f391abf4e037352cd783f6fa3c6b843d94 (patch) | |
| tree | bc2b1e5e48a071f56f1cdcc4e40cfc11ded77d53 | |
| parent | 2778fdbe5424485d135a37d384d6449113a6c2b5 (diff) | |
| parent | 1316df7aa98c4784f190d107206d0bb12c590b89 (diff) | |
| download | ffmpeg-streaming-e15e78f391abf4e037352cd783f6fa3c6b843d94.zip ffmpeg-streaming-e15e78f391abf4e037352cd783f6fa3c6b843d94.tar.gz | |
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>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavutil/avutil.h | 8 | ||||
| -rw-r--r-- | libavutil/utils.c | 2 |
5 files changed, 9 insertions, 8 deletions
@@ -28,6 +28,7 @@ /ffserver /config.* /coverage.info +/avversion.h /doc/*.1 /doc/*.3 /doc/*.html @@ -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) diff --git a/doc/APIchanges b/doc/APIchanges index b1ecc3c..bae2231 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,8 +15,8 @@ libavutil: 2014-08-09 API changes, most recent first: -2015-xx-xx - xxxxxx - lavu 53.xx.100 - Add avutil_version_info(). +2015-xx-xx - xxxxxxx - lavu 56.xx.0 + Add av_version_info(). -------- 8< --------- FFmpeg 2.7 was cut here -------- 8< --------- diff --git a/libavutil/avutil.h b/libavutil/avutil.h index eec2d55..187100b 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -171,11 +171,11 @@ unsigned avutil_version(void); /** - * Return an informative version string. This usually the actual release version - * number and a git hash. This string has no fixed format and can change any - * time. It should never be parsed by code. + * Return an informative version string. This usually is the actual release + * version number or a git commit description. This string has no fixed format + * and can change any time. It should never be parsed by code. */ -const char *avutil_version_info(void); +const char *av_version_info(void); /** * Return the libavutil build-time configuration. diff --git a/libavutil/utils.c b/libavutil/utils.c index 07bb380..2e3b1e0 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -30,7 +30,7 @@ #include "libavutil/ffversion.h" const char av_util_ffversion[] = "FFmpeg version " FFMPEG_VERSION; -const char *avutil_version_info(void) +const char *av_version_info(void) { return FFMPEG_VERSION; } |
