[FFmpeg-cvslog] Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:40:45 2015 +0200| [9c010ba66800fd335cc389c2a2b664216be985ae] | committer: Michael Niedermayer

Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

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

Conflicts:
	libavfilter/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c010ba66800fd335cc389c2a2b664216be985ae
---