* [FFmpeg-devel] [PATCH] avformat/matroskadec, mov: Fix declaration-after-statement warnings
@ 2023-10-08 22:16 Andreas Rheinhardt
2023-10-08 22:19 ` Michael Niedermayer
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Rheinhardt @ 2023-10-08 22:16 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskadec.c | 5 ++---
libavformat/mov.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
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;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/matroskadec, mov: Fix declaration-after-statement warnings
2023-10-08 22:16 [FFmpeg-devel] [PATCH] avformat/matroskadec, mov: Fix declaration-after-statement warnings Andreas Rheinhardt
@ 2023-10-08 22:19 ` Michael Niedermayer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Niedermayer @ 2023-10-08 22:19 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 628 bytes --]
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
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The real ebay dictionary, page 1
"Used only once" - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-08 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-08 22:16 [FFmpeg-devel] [PATCH] avformat/matroskadec, mov: Fix declaration-after-statement warnings Andreas Rheinhardt
2023-10-08 22:19 ` Michael Niedermayer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git