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 /doc/APIchanges | |
parent | 2778fdbe5424485d135a37d384d6449113a6c2b5 (diff) | |
parent | 1316df7aa98c4784f190d107206d0bb12c590b89 (diff) | |
download | ffmpeg-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>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index b1ecc3c545..bae223111c 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< --------- |