@@ -35,7 +35,6 @@ HEADERS = adler32.h                                                     \

           rational.h                                                    \

           samplefmt.h                                                   \

           sha.h                                                         \

-          sha1.h                                                        \

 BUILT_HEADERS = avconfig.h

@@ -25,7 +25,6 @@

 #include "avutil.h"

 #include "bswap.h"

 #include "sha.h"

-#include "sha1.h"

 #include "intreadwrite.h"

 /** hash context */

@@ -324,29 +323,6 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest)

         AV_WB32(digest + i*4, ctx->state[i]);

 }

-#if LIBAVUTIL_VERSION_MAJOR < 51

-struct AVSHA1 {

-    AVSHA sha;

-};

-

-const int av_sha1_size = sizeof(struct AVSHA1);

-

-void av_sha1_init(struct AVSHA1* context)

-{

-    av_sha_init(&context->sha, 160);

-}

-

-void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len)

-{

-    av_sha_update(&context->sha, data, len);

-}

-

-void av_sha1_final(struct AVSHA1* context, uint8_t digest[20])

-{

-    av_sha_final(&context->sha, digest);

-}

-#endif

-

 #ifdef TEST

 #include <stdio.h>

 #undef printf

deleted file mode 100644

@@ -1,57 +0,0 @@

-/*

- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>

- *

- * This file is part of Libav.

- *

- * Libav is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * Libav is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with Libav; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- */

-

-#ifndef AVUTIL_SHA1_H

-#define AVUTIL_SHA1_H

-

-#include <stdint.h>

-

-extern const int av_sha1_size;

-

-struct AVSHA1;

-

-/**

- * Initialize SHA-1 hashing.

- *

- * @param context pointer to the function context (of size av_sha_size)

- * @deprecated use av_sha_init() instead

- */

-void av_sha1_init(struct AVSHA1* context);

-

-/**

- * Update hash value.

- *

- * @param context hash function context

- * @param data    input data to update hash with

- * @param len     input data length

- * @deprecated use av_sha_update() instead

- */

-void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len);

-

-/**

- * Finish hashing and output digest value.

- *

- * @param context hash function context

- * @param digest  buffer where output digest value is stored

- * @deprecated use av_sha_final() instead

- */

-void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);

-

-#endif /* AVUTIL_SHA1_H */