X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fsha.c;h=5a3b57535fee9784e3b4e0bc3948a495035e053b;hb=98aea87b1a3a96b9d82deca09291aaec2f54399e;hp=1f1de2c6e9a9f1c353bf9c82c2bbbbfadc534bfc;hpb=87d718aefc4f8f3d890c2a18f64706908f4ab107;p=ffmpeg

diff --git a/libavutil/sha.c b/libavutil/sha.c
index 1f1de2c6e9a..5a3b57535fe 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -21,10 +21,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
+#include <string.h>
 #include "avutil.h"
 #include "bswap.h"
 #include "sha.h"
+#include "sha1.h"
+#include "intreadwrite.h"
 
 /** hash context */
 typedef struct AVSHA {
@@ -180,7 +182,7 @@ static void sha256_transform(uint32_t *state, const uint8_t buffer[64])
 {
     unsigned int i, a, b, c, d, e, f, g, h;
     uint32_t block[64];
-    uint32_t T1, T2;
+    uint32_t T1, av_unused(T2);
 
     a = state[0];
     b = state[1];
@@ -319,7 +321,7 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest)
         av_sha_update(ctx, "", 1);
     av_sha_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */
     for (i = 0; i < ctx->digest_len; i++)
-        ((uint32_t*)digest)[i] = be2me_32(ctx->state[i]);
+        AV_WB32(digest + i*4, ctx->state[i]);
 }
 
 #if LIBAVUTIL_VERSION_MAJOR < 51