diff mbox series

[FFmpeg-devel] avformat/matroskadec, mov: Fix declaration-after-statement warnings

Message ID AS8P250MB0744F44650CD4F8D8DD8D8898FCFA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 37b5f4a1f6a9c7c8f3620c6b1f7f2b0bb997e5d7
Headers show
Series [FFmpeg-devel] avformat/matroskadec, mov: Fix declaration-after-statement warnings | expand

Commit Message

Andreas Rheinhardt Oct. 8, 2023, 10:16 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/matroskadec.c | 5 ++---
 libavformat/mov.c         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Michael Niedermayer Oct. 8, 2023, 10:19 p.m. UTC | #1 
On Mon, Oct 09, 2023 at 12:16:35AM +0200, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/matroskadec.c | 5 ++---
>  libavformat/mov.c         | 2 +-
>  2 files changed, 3 insertions(+), 4 deletions(-)

LGTM

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index af0e5d7c0b..8f000f86be 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -4542,14 +4542,13 @@  static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
         int64_t pre_bytes, pre_ns;
         double pre_sec, prebuffer, bits_per_second;
         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)
             return -1;
         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
         // 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) {
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1bd224f390..2f29487beb 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4903,9 +4903,9 @@  static int avif_add_stream(MOVContext *c, int item_id)
 {
     MOVStreamContext *sc;
     AVStream *st;
+    int item_index = -1;
     if (c->fc->nb_streams)
         return AVERROR_INVALIDDATA;
-    int item_index = -1;
     for (int i = 0; i < c->avif_info_size; i++)
         if (c->avif_info[i].item_id == item_id) {
             item_index = i;