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 /libavutil/avutil.h | |
| 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 'libavutil/avutil.h')
| -rw-r--r-- | libavutil/avutil.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index eec2d559a7..187100bc8d 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. |