har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix regression failure after adler simplification

Browse Source 
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-07-20 10:22:07 +00:00
parent 79dc59b726
commit ccb159940b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/aviobuf.c
View File

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

4
libavformat/nut.c
View File

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