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

Michael Niedermayer committed 11 years ago

Commit e15e78f2 parents 2778fdb 1316df75 files · +9 −8Browse files

Showing the changes to doc/APIchanges (1 of 5 files). Show all

Unified · Split

doc/APIchanges+2−2

@@ -15,8 +15,8 @@ libavutil: 2014-08-09 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
18		−2015-xx-xx - xxxxxx - lavu 53.xx.100
19		− Add avutil_version_info().
	18	+2015-xx-xx - xxxxxxx - lavu 56.xx.0
	19	+ Add av_version_info().
20	20
21	21	-------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------
22	22

Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code