Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:06:23 +0000 (21:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:06:46 +0000 (21:06 +0200)
commitd563e13a7c7daa03c89636f85305e1839bcb27be
tree0bb0339665aa0d1a0f8b439b64b71b9f8d5a57b7
parent866404df2d4690e0e0958d48754debc812fec5af
parent832129431fd5c693b12c32a1563944c631feaf36
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>
doc/APIchanges
libavutil/version.h