From ccb159940b2c6daaf0c9bf8f0fb8c87317754e1c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 20 Jul 2006 10:22:07 +0000
Subject: [PATCH] fix regression failure after adler simplification
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/aviobuf.c | 2 +-
libavformat/nut.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 070917d091c..b0f8136dcef 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -298,7 +298,7 @@ unsigned long get_checksum(ByteIOContext *s){
void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum){
s->update_checksum= update_checksum;
if(s->update_checksum){
- s->checksum= s->update_checksum(checksum, NULL, 0);
+ s->checksum= checksum;
s->checksum_ptr= s->buf_ptr;
}
}
diff --git a/libavformat/nut.c b/libavformat/nut.c
index a33dfb89140..6f78596e36c 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -331,7 +331,7 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch
size= get_v(bc);
- init_checksum(bc, calculate_checksum ? av_adler32_update : NULL, 0);
+ init_checksum(bc, calculate_checksum ? av_adler32_update : NULL, 1);
nut->packet_start[2] = start;
nut->written_packet_size= size;
@@ -476,7 +476,7 @@ static int put_packetheader(NUTContext *nut, ByteIOContext *bc, int max_size, in
put_v(bc, nut->written_packet_size); /* forward ptr */
if(calculate_checksum)
- init_checksum(bc, av_adler32_update, 0);
+ init_checksum(bc, av_adler32_update, 1);
return 0;
}
--
GitLab