aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/ebml_extractor.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/ebml_extractor.c')
-rw-r--r--src/plugins/ebml_extractor.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/ebml_extractor.c b/src/plugins/ebml_extractor.c
index 4661804..42f7ff4 100644
--- a/src/plugins/ebml_extractor.c
+++ b/src/plugins/ebml_extractor.c
@@ -1003,10 +1003,12 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
1003 if (state->valid_ebml && !state->reported_ebml) 1003 if (state->valid_ebml && !state->reported_ebml)
1004 { 1004 {
1005 state->reported_ebml = 1; 1005 state->reported_ebml = 1;
1006 snprintf (format, MAX_STRING_SIZE, "%llu", state->ebml_version); 1006 snprintf (format, MAX_STRING_SIZE, "%llu", (unsigned long long) state->ebml_version);
1007 format[MAX_STRING_SIZE] = '\0'; 1007 format[MAX_STRING_SIZE] = '\0';
1008 ADD_EBML(format, EXTRACTOR_METATYPE_FORMAT_VERSION); 1008 ADD_EBML(format, EXTRACTOR_METATYPE_FORMAT_VERSION);
1009 snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype, state->doctype_version, state->ebml_version); 1009 snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype,
1010 (unsigned long long) state->doctype_version,
1011 (unsigned long long) state->ebml_version);
1010 format[MAX_STRING_SIZE] = '\0'; 1012 format[MAX_STRING_SIZE] = '\0';
1011 ADD_EBML (format, EXTRACTOR_METATYPE_RESOURCE_TYPE); 1013 ADD_EBML (format, EXTRACTOR_METATYPE_RESOURCE_TYPE);
1012 } 1014 }
@@ -1026,7 +1028,7 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
1026 if (state->matroska_info_duration != -1.0) 1028 if (state->matroska_info_duration != -1.0)
1027 { 1029 {
1028 uint64_t seconds = (uint64_t) ((state->matroska_info_duration * (float) state->matroska_info_timecode_scale) / 1e+9); 1030 uint64_t seconds = (uint64_t) ((state->matroska_info_duration * (float) state->matroska_info_timecode_scale) / 1e+9);
1029 snprintf (format, MAX_STRING_SIZE, "%llus", seconds); 1031 snprintf (format, MAX_STRING_SIZE, "%llus", (unsigned long long) seconds);
1030 format[MAX_STRING_SIZE] = '\0'; 1032 format[MAX_STRING_SIZE] = '\0';
1031 ADD_MATROSKA(format, EXTRACTOR_METATYPE_DURATION); 1033 ADD_MATROSKA(format, EXTRACTOR_METATYPE_DURATION);
1032 } 1034 }
@@ -1159,7 +1161,9 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
1159 * done either way (stretching horizontally or squishing vertically), 1161 * done either way (stretching horizontally or squishing vertically),
1160 * so let's stick to hard cold pixel counts. 1162 * so let's stick to hard cold pixel counts.
1161 */ 1163 */
1162 snprintf (format, MAX_STRING_SIZE, "%llux%llu", state->matroska_track_video_pixel_width, state->matroska_track_video_pixel_height); 1164 snprintf (format, MAX_STRING_SIZE, "%llux%llu",
1165 (unsigned long long) state->matroska_track_video_pixel_width,
1166 (unsigned long long) state->matroska_track_video_pixel_height);
1163 format[MAX_STRING_SIZE] = '\0'; 1167 format[MAX_STRING_SIZE] = '\0';
1164 ADD_MATROSKA (format, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS); 1168 ADD_MATROSKA (format, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
1165 } 1169 }
@@ -1176,13 +1180,14 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
1176 hz_part[MAX_STRING_SIZE] = '\0'; 1180 hz_part[MAX_STRING_SIZE] = '\0';
1177 1181
1178 if (state->matroska_track_audio_bit_depth > 0) 1182 if (state->matroska_track_audio_bit_depth > 0)
1179 snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", state->matroska_track_audio_bit_depth); 1183 snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", (unsigned long long) state->matroska_track_audio_bit_depth);
1180 else 1184 else
1181 bit_part[0] = '\0'; 1185 bit_part[0] = '\0';
1182 bit_part[MAX_STRING_SIZE] = '\0'; 1186 bit_part[MAX_STRING_SIZE] = '\0';
1183 1187
1184 snprintf (format, MAX_STRING_SIZE, "%s track %s(%s, %llu-channel %sat %s) [%s]", 1188 snprintf (format, MAX_STRING_SIZE, "%s track %s(%s, %llu-channel %sat %s) [%s]",
1185 track_type_string, name_part, codec_part, state->matroska_track_audio_channels, 1189 track_type_string, name_part, codec_part,
1190 (unsigned long long) state->matroska_track_audio_channels,
1186 bit_part, hz_part, state->matroska_track_language); 1191 bit_part, hz_part, state->matroska_track_language);
1187 } 1192 }
1188 else 1193 else