[FFmpeg-cvslog] Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:37:59 2015 +0200| [818ff7ff5a192c4b0999b375e555541f05b6730d] | committer: Michael Niedermayer

Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'

* commit '0f87f9b4fceee854f09da2d1ef329245196775f8':
  lavd: Add library identifier

Conflicts:
	libavdevice/version.h

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

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