virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

Browse Source 
* 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: f91126643a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-07-03 03:20:09 +02:00
parent 2778fdbe54 1316df7aa9
commit e15e78f391
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@@ -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< ---------