From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH] avformat/argo_cvg: Fix checksum
Date: Tue, 15 Feb 2022 14:05:17 +0100
Message-ID: <20220215130517.25172-1-michael@niedermayer.cc> (raw)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/argo_cvg.c | 15 +++++----------
libavformat/version.h | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c
index c5da32536d..dfdf126c17 100644
--- a/libavformat/argo_cvg.c
+++ b/libavformat/argo_cvg.c
@@ -335,19 +335,14 @@ static int argo_cvg_write_trailer(AVFormatContext *s)
ArgoCVGMuxContext *ctx = s->priv_data;
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, "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);
if ((ret = avio_seek(s->pb, 0, SEEK_SET)) < 0)
diff --git a/libavformat/version.h b/libavformat/version.h
index 5439dad170..26234573b8 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 59
#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, \
LIBAVFORMAT_VERSION_MINOR, \
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2022-02-15 13:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 13:05 Michael Niedermayer [this message]
2022-02-15 14:25 ` Zane van Iperen
2022-02-15 21:17 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220215130517.25172-1-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git