diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:23:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:37:05 +0200 |
| commit | 10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 (patch) | |
| tree | ad169614a86989dbb4ead1e188d2ad71ef7bfcf7 /libavutil/sha.c | |
| parent | 2c18893a911657205bd45ff8a666882610e57700 (diff) | |
| parent | f83acb096c0ea1ec181941c141d1ab6fb24820eb (diff) | |
| download | ffmpeg-10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Makefile: Include dependencies for test tools, too
Remove a version check in av_log made unnecessary by the big bump.
update last major version increase dates in APIchanges
Reduce picture size for yadif.
oggdec: use av_freep() instead of av_free()
avio: Fix sanity checks in ffurl_read*
libavformat: Free AVFormatContext->streams
libavformat: Make protocols pass URLContext as log context where available
asf: remove commented out code in asf_read_seek
not pulled: libpostproc: Remove crufty code disabled by the big bump.
Reflect 0.7_beta1 release in the Changelog
not pulled: sws: remove disabled cruft.
lavu: remove disabled ff_random_get_seed cruft.
lavu: remove disabled sha1 cruft.
Conflicts:
Changelog
libavutil/sha1.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.c')
| -rw-r--r-- | libavutil/sha.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libavutil/sha.c b/libavutil/sha.c index 2657f7eb90..ff9e55720f 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -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 |