ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu
Jul 30 18:28:43 2015 +0200| [d560c61125b3ee0ec8cd2e228f0604b63f85b8b2] |
committer: Michael Niedermayer
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 <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d560c61125b3ee0ec8cd2e228f0604b63f85b8b2
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
