max/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: Fix shadowing

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-02-21 14:26:17 +01:00
parent fd88a52be0
commit 5198d8802c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/matroskadec.c
+6 -6
View File
@@ -1280,8 +1280,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 id64;
res = ebml_read_num(matroska, pb, 4, &id64, 0);
if (res < 0) {
if (pb->eof_reached && res == AVERROR_EOF) {
if (matroska->is_live)
@@ -1300,7 +1300,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska,
}
return res;
}
matroska->current_id = id | 1 << 7 * res;
matroska->current_id = id64 | 1 << 7 * res;
pos_alt = pos + res;
} else {
pos_alt = pos;
@@ -3046,7 +3046,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;
}
@@ -4758,8 +4758,8 @@ 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++)
av_bprintf(&bprint, "%" PRId64",", sti->index_entries[i].timestamp);
for (int j = 0; j < sti->nb_index_entries; j++)
av_bprintf(&bprint, "%" PRId64",", sti->index_entries[j].timestamp);
if (!av_bprint_is_complete(&bprint)) {
av_bprint_finalize(&bprint, NULL);
return AVERROR(ENOMEM);