Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:20:09 +0000 (03:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:22:48 +0000 (03:22 +0200)
commite15e78f391abf4e037352cd783f6fa3c6b843d94
treebc2b1e5e48a071f56f1cdcc4e40cfc11ded77d53
parent2778fdbe5424485d135a37d384d6449113a6c2b5
parent1316df7aa98c4784f190d107206d0bb12c590b89
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

See: f91126643a91c2d3f8d8e210c8facaf259951b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
.gitignore
Makefile
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c