Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:37:59 +0000 (03:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:40:06 +0000 (03:40 +0200)
* commit '0f87f9b4fceee854f09da2d1ef329245196775f8':
  lavd: Add library identifier

Conflicts:
libavdevice/version.h

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

Trivial merge