Michael Niedermayer d563e13a7c Merge commit '832129431fd5c693b12c32a1563944c631feaf36' ...

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

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-07-03 21:06:46 +02:00

4.0 KiB

Raw Blame History

View Raw