[FFmpeg-cvslog] avformat/mov: Simplify data->hex conversion
Andreas Rheinhardt
git at videolan.org
Wed Dec 8 15:29:01 EET 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Dec 6 01:42:46 2021 +0100| [17a93fd3772269cf3978783ddca90e3ba037cb81] | committer: Andreas Rheinhardt
avformat/mov: Simplify data->hex conversion
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17a93fd3772269cf3978783ddca90e3ba037cb81
---
libavformat/mov.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ff5a55d0e6..9ebfa0bcc7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -979,6 +979,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom)
uint8_t output[64];
uint8_t file_checksum[20];
uint8_t calculated_checksum[20];
+ char checksum_string[2 * sizeof(file_checksum) + 1];
struct AVSHA *sha;
int i;
int ret = 0;
@@ -1003,10 +1004,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_read(pb, output, 4); // go to offset 4, absolute position 0x28d
avio_read(pb, file_checksum, 20);
- av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools
- for (i = 0; i < 20; i++)
- av_log(c->fc, AV_LOG_INFO, "%02x", file_checksum[i]);
- av_log(c->fc, AV_LOG_INFO, "\n");
+ // required by external tools
+ ff_data_to_hex(checksum_string, file_checksum, sizeof(file_checksum), 1);
+ av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == %s\n", checksum_string);
/* verify activation data */
if (!activation_bytes) {
More information about the ffmpeg-cvslog
mailing list