#define FORMAT_VERSION_OPT \
{ "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC }
-#if CONFIG_HASH_MUXER
-static const AVOption hash_options[] = {
+#if CONFIG_HASH_MUXER || CONFIG_STREAMHASH_MUXER
+static const AVOption hash_streamhash_options[] = {
HASH_OPT("sha256"),
{ NULL },
};
};
#endif
-#if CONFIG_STREAMHASH_MUXER
-static const AVOption streamhash_options[] = {
- HASH_OPT("sha256"),
- { NULL },
-};
-#endif
-
#if CONFIG_MD5_MUXER
static const AVOption md5_options[] = {
HASH_OPT("md5"),
static const AVClass hashenc_class = {
.class_name = "hash muxer",
.item_name = av_default_item_name,
- .option = hash_options,
+ .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT,
};
static const AVClass streamhashenc_class = {
.class_name = "stream hash muxer",
.item_name = av_default_item_name,
- .option = streamhash_options,
+ .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT,
};
avio_write(s->pb, buf, strlen(buf));
if (c->format_version > 1 && pkt->side_data_elems) {
- int i, j;
+ int i;
avio_printf(s->pb, ", S=%d", pkt->side_data_elems);
for (i = 0; i < pkt->side_data_elems; i++) {
av_hash_init(c->hashes[0]);
if (HAVE_BIGENDIAN && pkt->side_data[i].type == AV_PKT_DATA_PALETTE) {
- for (j = 0; j < pkt->side_data[i].size; j += sizeof(uint32_t)) {
+ for (size_t j = 0; j < pkt->side_data[i].size; j += sizeof(uint32_t)) {
uint32_t data = AV_RL32(pkt->side_data[i].data + j);
av_hash_update(c->hashes[0], (uint8_t *)&data, sizeof(uint32_t));
}
} else
av_hash_update(c->hashes[0], pkt->side_data[i].data, pkt->side_data[i].size);
- snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1), ", %8d, ", pkt->side_data[i].size);
+ snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1),
+ ", %8"SIZE_SPECIFIER", ", pkt->side_data[i].size);
len = strlen(buf);
av_hash_final_hex(c->hashes[0], buf + len, sizeof(buf) - len);
avio_write(s->pb, buf, strlen(buf));