[Ffmpeg-cvslog] r5803 - in trunk/libavformat: aviobuf.c nut.c
michael
subversion
Thu Jul 20 12:22:08 CEST 2006
Author: michael
Date: Thu Jul 20 12:22:07 2006
New Revision: 5803
Modified:
trunk/libavformat/aviobuf.c
trunk/libavformat/nut.c
Log:
fix regression failure after adler simplification
Modified: trunk/libavformat/aviobuf.c
==============================================================================
--- trunk/libavformat/aviobuf.c (original)
+++ trunk/libavformat/aviobuf.c Thu Jul 20 12:22:07 2006
@@ -298,7 +298,7 @@
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;
}
}
Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c (original)
+++ trunk/libavformat/nut.c Thu Jul 20 12:22:07 2006
@@ -331,7 +331,7 @@
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 @@
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;
}
More information about the ffmpeg-cvslog
mailing list