Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:40:45 +0000 (03:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:41:20 +0000 (03:41 +0200)
commit9c010ba66800fd335cc389c2a2b664216be985ae
tree33d908e655761d82a10935f10705ddf9a42ad2f3
parent818ff7ff5a192c4b0999b375e555541f05b6730d
parent0d449c81b3dd25835ae6ac849cdd150f35b9c5c6
Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

* commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6':
  lavfi: Add library identifier

Conflicts:
libavfilter/version.h

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