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

avformat/argo_cvg: Fix checksum

Browse Source 
Reviewed-by: Zane van Iperen <zane@zanevaniperen.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-02-15 14:03:08 +01:00
parent f306b8e80a
commit 2db9ffb88b
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/argo_cvg.c
View File

@ -335,19 +335,14 @@ static int argo_cvg_write_trailer(AVFormatContext *s)
ArgoCVGMuxContext *ctx = s->priv_data; ArgoCVGMuxContext *ctx = s->priv_data;
int64_t ret; int64_t ret;
ctx->checksum += (ctx->size & 255)
+ ((ctx->size>> 8) & 255)
+ ((ctx->size>>16) & 255)
+ (ctx->size>>24);
av_log(s, AV_LOG_TRACE, "size = %zu\n", ctx->size); av_log(s, AV_LOG_TRACE, "size = %zu\n", ctx->size);
av_log(s, AV_LOG_TRACE, "checksum = %u\n", ctx->checksum); av_log(s, AV_LOG_TRACE, "checksum = %u\n", ctx->checksum);
/*
* NB: This is wrong. We're always slightly under the original.
* Verified by remuxing. For reference (orig - remuxed):
* - TCLD.CVG: 4706074 - 4705696 = 378
* - DANLOOP1.CVG: 5684641 - 5684212 = 429
* - CRYS.CVG: 2495499 - 2495367 = 132
* - PICKUP88.CVG: 1348091 - 1347937 = 154
* - SELECT1.CVG: 549987 - 549752 = 235
* Also NB: it doesn't matter, the game doesn't check them.
*/
avio_wl32(s->pb, ctx->checksum); avio_wl32(s->pb, ctx->checksum);
if ((ret = avio_seek(s->pb, 0, SEEK_SET) < 0)) if ((ret = avio_seek(s->pb, 0, SEEK_SET) < 0))

2
libavformat/version.h
View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MAJOR 59
#define LIBAVFORMAT_VERSION_MINOR 17 #define LIBAVFORMAT_VERSION_MINOR 17
#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_MICRO 102
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \