Skip to content
Snippets Groups Projects
Commit d563e13a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '83212943'


* commit '83212943':
  lavu: Add version information for av_version_info()

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 866404df 83212943
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment