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)
commit818ff7ff5a192c4b0999b375e555541f05b6730d
tree33d908e655761d82a10935f10705ddf9a42ad2f3
parent16dd0426e5681ff4ad0752f7fd1d27611e0cb05a
parent0f87f9b4fceee854f09da2d1ef329245196775f8
Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'

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

Conflicts:
libavdevice/version.h

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