diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-07-20 10:22:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-07-20 10:22:07 +0000 |
| commit | ccb159940b2c6daaf0c9bf8f0fb8c87317754e1c (patch) | |
| tree | 35aae8c4c6c8909b146fb66c4022b1d9f4221abf | |
| parent | 79dc59b726f73f9464c8d5f74e8a01fab8151836 (diff) | |
| download | ffmpeg-ccb159940b2c6daaf0c9bf8f0fb8c87317754e1c.tar.gz | |
fix regression failure after adler simplification
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/aviobuf.c | 2 | ||||
| -rw-r--r-- | libavformat/nut.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 070917d091..b0f8136dce 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 a33dfb8914..6f78596e36 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; } |