Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 16:28:43 +0000 (18:28 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 16:37:05 +0000 (18:37 +0200)
commitd560c61125b3ee0ec8cd2e228f0604b63f85b8b2
tree7234ace48847d414c1b4a6fa763658574e4e5310
parentba12ba859aabfa7153ba397d869db13acdaba340
parent6877537ff321136cf78ab03b8b91e6b6f218db5b
Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'

* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
  hmac: add missing version bump and APIChanges entry

Conflicts:
libavutil/version.h

version.h is not changed as the code has been added 2 years ago in FFmpeg

See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
doc/APIchanges