From: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu, 30 Jul 2015 16:28:43 +0000 (+0200)
Subject: Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'
X-Git-Tag: n2.9-dev~628
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d560c61125b3ee0ec8cd2e228f0604b63f85b8b2?hp=d560c61125b3ee0ec8cd2e228f0604b63f85b8b2

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>
---