The branch, master has been updated
via dd05022def835129028b8fc53602cea4a860496a (commit)
via 08b74d5d5cc188e9c6e6ef72d83bb14cb7311893 (commit)
from f2b9b1923d69b50dbd9da3c7e1d1bf74a0b75a2d (commit)
- Log -----------------------------------------------------------------
commit dd05022def835129028b8fc53602cea4a860496a
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Nov 8 17:15:57 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sun Nov 9 13:44:18 2025 +0100
avformat/mp3enc: Avoid av_unused
Possible now that -Wdeclaration-after-statement is no more.
Reviewed-by: Lynne <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 0ebd480d3f..724c7269dc 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -322,7 +322,6 @@ static int mp3_write_audio_packet(AVFormatContext *s,
AVPacket *pkt)
if (pkt->data && pkt->size >= 4) {
MPADecodeHeader mpah;
int ret;
- av_unused int base;
uint32_t h;
h = AV_RB32(pkt->data);
@@ -339,7 +338,7 @@ static int mp3_write_audio_packet(AVFormatContext *s,
AVPacket *pkt)
#ifdef FILTER_VBR_HEADERS
/* filter out XING and INFO headers. */
- base = 4 + xing_offtbl[mpah.lsf == 1][mpah.nb_channels == 1];
+ int base = 4 + xing_offtbl[mpah.lsf == 1][mpah.nb_channels == 1];
if (base + 4 <= pkt->size) {
uint32_t v = AV_RB32(pkt->data + base);
commit 08b74d5d5cc188e9c6e6ef72d83bb14cb7311893
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Nov 8 17:02:13 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sun Nov 9 13:42:27 2025 +0100
swresample/swresample: Avoid av_unused
Possible now that -Wdeclaration-after-statement is no longer used.
Reviewed-by: Lynne <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 40485a019c..e7ce4a10aa 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -720,14 +720,13 @@ int attribute_align_arg swr_convert(struct SwrContext *s,
{
AudioData * in= &s->in;
AudioData *out= &s->out;
- av_unused int max_output;
if (!swr_is_initialized(s)) {
av_log(s, AV_LOG_ERROR, "Context has not been initialized\n");
return AVERROR(EINVAL);
}
#if defined(ASSERT_LEVEL) && ASSERT_LEVEL >1
- max_output = swr_get_out_samples(s, in_count);
+ int max_output = swr_get_out_samples(s, in_count);
#endif
while(s->drop_output > 0){
-----------------------------------------------------------------------
Summary of changes:
libavformat/mp3enc.c | 3 +--
libswresample/swresample.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
