On 9/8/2024 9:23 PM, Marvin Scholz wrote:
--- libavformat/matroskadec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c8741ff2af..60b20e9658 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1281,8 +1281,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska, MatroskaLevel *level = matroska->num_levels ? &matroska->levels[matroska->num_levels - 1] : NULL;if (!matroska->current_id) {- uint64_t id; - res = ebml_read_num(matroska, pb, 4, &id, 0); + uint64_t tmp_id; + res = ebml_read_num(matroska, pb, 4, &tmp_id, 0); if (res < 0) { if (pb->eof_reached && res == AVERROR_EOF) { if (matroska->is_live) @@ -1301,7 +1301,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska, } return res; } - matroska->current_id = id | 1 << 7 * res; + matroska->current_id = tmp_id | 1 << 7 * res; pos_alt = pos + res; } else { pos_alt = pos; @@ -3039,7 +3039,7 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, if (track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB && track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED && track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG) { - int ret = mkv_stereo3d_conv(st, track->video.stereo_mode); + ret = mkv_stereo3d_conv(st, track->video.stereo_mode); if (ret < 0) return ret; } @@ -4683,8 +4683,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) AVBPrint bprint; char *buf; int64_t cues_start = -1, cues_end = -1, before_pos, bandwidth; - int i; - int ret; + int i, ret;
Seems unrelated.
// determine cues start and end positions
for (i = 0; i < seekhead_list->nb_elem; i++)
@@ -4740,7 +4739,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s,
int64_t init_range)
// Store cue point timestamps as a comma separated list
// for checking subsegment alignment in the muxer.
av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED);
- for (int i = 0; i < sti->nb_index_entries; i++)
+ for (i = 0; i < sti->nb_index_entries; i++)
av_bprintf(&bprint, "%" PRId64",", sti->index_entries[i].timestamp);
if (!av_bprint_is_complete(&bprint)) {
av_bprint_finalize(&bprint, NULL);
OpenPGP_signature.asc
Description: OpenPGP digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
