[FFmpeg-cvslog] lavu/hash: Fix adler32 calculation

James Almer git at videolan.org
Thu May 16 00:01:51 CEST 2013


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed May 15 18:34:58 2013 -0300| [c55c715c81dec16de1c4a55faf0c595e18fff1e5] | committer: Michael Niedermayer

lavu/hash: Fix adler32 calculation

Adler must be initialized with a non zero value.

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/hash.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavutil/hash.c b/libavutil/hash.c
index 80bf164..a08d2cf 100644
--- a/libavutil/hash.c
+++ b/libavutil/hash.c
@@ -115,8 +115,8 @@ void av_hash_init(AVHashContext *ctx)
     case SHA160:  av_sha_init(ctx->ctx, 160); break;
     case SHA224:  av_sha_init(ctx->ctx, 224); break;
     case SHA256:  av_sha_init(ctx->ctx, 256); break;
-    case CRC32:
-    case ADLER32: ctx->crc = 0; break;
+    case CRC32:   ctx->crc = 0; break;
+    case ADLER32: ctx->crc = 1; break;
     }
 }
 
@@ -141,8 +141,8 @@ void av_hash_final(AVHashContext *ctx, uint8_t *dst)
     case SHA160:
     case SHA224:
     case SHA256:  av_sha_final(ctx->ctx, dst); break;
-    case CRC32:
-    case ADLER32: AV_WL32(dst, ctx->crc); break;
+    case CRC32:   AV_WL32(dst, ctx->crc); break;
+    case ADLER32: AV_WB32(dst, ctx->crc); break;
     }
 }
 



More information about the ffmpeg-cvslog mailing list