Commit 818ff7ff authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0f87f9b4'

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

Conflicts:
	libavdevice/version.h

See: a70b4935Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 16dd0426 0f87f9b4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment