RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 11:47:04 +00:00
Code Issues Projects Releases Wiki Activity

avformat/matroskadec, mov: Fix declaration-after-statement warnings

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-10-09 00:16:08 +02:00
parent 7fedbc7606
commit 37b5f4a1f6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskadec.c
View File

@ -4542,14 +4542,13 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
int64_t pre_bytes, pre_ns; int64_t pre_bytes, pre_ns;
double pre_sec, prebuffer, bits_per_second; double pre_sec, prebuffer, bits_per_second;
CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start); CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start);
// Start with the first Cue.
CueDesc desc_end = desc_beg;
if (time_ns > INT64_MAX - prebuffer_ns) if (time_ns > INT64_MAX - prebuffer_ns)
return -1; return -1;
prebuffered_ns = time_ns + prebuffer_ns; prebuffered_ns = time_ns + prebuffer_ns;
// Start with the first Cue.
CueDesc desc_end = desc_beg;
// Figure out how much data we have downloaded for the prebuffer. This will // Figure out how much data we have downloaded for the prebuffer. This will
// be used later to adjust the bits per sample to try. // be used later to adjust the bits per sample to try.
while (desc_end.start_time_ns != -1 && desc_end.end_time_ns < prebuffered_ns) { while (desc_end.start_time_ns != -1 && desc_end.end_time_ns < prebuffered_ns) {

2
libavformat/mov.c
View File

@ -4903,9 +4903,9 @@ static int avif_add_stream(MOVContext *c, int item_id)
{ {
MOVStreamContext *sc; MOVStreamContext *sc;
AVStream *st; AVStream *st;
int item_index = -1;
if (c->fc->nb_streams) if (c->fc->nb_streams)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
int item_index = -1;
for (int i = 0; i < c->avif_info_size; i++) for (int i = 0; i < c->avif_info_size; i++)
if (c->avif_info[i].item_id == item_id) { if (c->avif_info[i].item_id == item_id) {
item_index = i; item_index = i;