opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-04-21 03:23:46 +02:00
parent 2c18893a91 f83acb096c
commit 10d2ae8cf7
15 changed files with 29 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavutil/sha.c
View File

@ -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