[FFmpeg-cvslog] avutil/hmac: support another ABI difference to the fork

Michael Niedermayer git at videolan.org
Thu Jul 30 01:26:08 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 30 01:03:35 2015 +0200| [8c5cc7b7fba0986cb535cf96b0def708de1087b2] | committer: Michael Niedermayer

avutil/hmac: support another ABI difference to the fork

spotted this and so adding it.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c5cc7b7fba0986cb535cf96b0def708de1087b2
---

 libavutil/hmac.h |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavutil/hmac.h b/libavutil/hmac.h
index d36d4de..4045c08 100644
--- a/libavutil/hmac.h
+++ b/libavutil/hmac.h
@@ -23,6 +23,7 @@
 
 #include <stdint.h>
 
+#include "libavutil/avconfig.h"
 /**
  * @defgroup lavu_hmac HMAC
  * @ingroup lavu_crypto
@@ -32,7 +33,11 @@
 enum AVHMACType {
     AV_HMAC_MD5,
     AV_HMAC_SHA1,
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+    AV_HMAC_SHA224,
+#else
     AV_HMAC_SHA224 = 10,
+#endif
     AV_HMAC_SHA256,
     AV_HMAC_SHA384,
     AV_HMAC_SHA512,



More information about the ffmpeg-cvslog mailing list