This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit d5ae10e6d4b6f2922c45b7f391a8e4ca45c82a59 Author: Marvin Scholz <[email protected]> AuthorDate: Tue Feb 17 21:10:03 2026 +0100 Commit: Marvin Scholz <[email protected]> CommitDate: Tue Apr 28 12:29:37 2026 +0000 avformat: replace fall-through comments --- libavformat/id3v2.c | 3 ++- libavformat/img2dec.c | 5 +++-- libavformat/matroskadec.c | 3 ++- libavformat/mm.c | 3 ++- libavformat/movenccenc.c | 5 +++-- libavformat/options.c | 3 ++- libavformat/rtpenc.c | 5 +++-- libavformat/sbgdec.c | 3 ++- libavformat/tls_libtls.c | 3 ++- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 1b481d302c..46cb03a6b9 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -27,6 +27,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #if CONFIG_ZLIB #include <zlib.h> @@ -293,7 +294,7 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, *maxread = left; return AVERROR_INVALIDDATA; } - // fall-through + av_fallthrough; case ID3v2_ENCODING_UTF16BE: while ((left > 1) && ch) { diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ecb7ea8946..921458fea9 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -21,6 +21,7 @@ */ #include "config_components.h" +#include "libavutil/attributes.h" #define _DEFAULT_SOURCE #define _BSD_SOURCE @@ -769,11 +770,11 @@ static int jpeg_probe(const AVProbeData *p) case APP0: if (c == APP0 && AV_RL32(&b[i + 4]) == MKTAG('J','F','I','F')) got_header = 1; - /* fallthrough */ + av_fallthrough; case APP1: if (c == APP1 && AV_RL32(&b[i + 4]) == MKTAG('E','x','i','f')) got_header = 1; - /* fallthrough */ + av_fallthrough; case APP2: case APP3: case APP4: diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b303d534aa..c81623a182 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -34,6 +34,7 @@ #include <inttypes.h> #include <stdio.h> +#include "libavutil/attributes.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" #include "libavutil/bprint.h" @@ -2517,7 +2518,7 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M "Explicit block Addition Mapping type \"Use BlockAddIDValue\", value %"PRIu64"," " name \"%s\" found.\n", mapping->value, mapping->name ? mapping->name : ""); type = MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE; - // fall-through + av_fallthrough; case MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE: case MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35: if (mapping->value != type) { diff --git a/libavformat/mm.c b/libavformat/mm.c index 4e69da0519..dc2f02fbde 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -31,6 +31,7 @@ * http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM */ +#include "libavutil/attributes.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" @@ -190,7 +191,7 @@ static int read_packet(AVFormatContext *s, default : av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type); - /* fallthrough */ + av_fallthrough; case MM_TYPE_AUDIO2 : avio_skip(pb, length); } diff --git a/libavformat/movenccenc.c b/libavformat/movenccenc.c index e5ae11a9c9..4e1f31d2b5 100644 --- a/libavformat/movenccenc.c +++ b/libavformat/movenccenc.c @@ -22,6 +22,7 @@ #include "libavcodec/av1_parse.h" #include "libavcodec/bytestream.h" #include "libavcodec/cbs_av1.h" +#include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "avio_internal.h" @@ -422,7 +423,7 @@ int ff_mov_cenc_av1_write_obus(AVFormatContext *s, MOVMuxCencContext* ctx, fh_data_size = unit->data_size; break; } - // fall-through + av_fallthrough; case AV1_OBU_SEQUENCE_HEADER: case AV1_OBU_METADATA: avio_write(pb, unit->data, unit->data_size); @@ -433,7 +434,7 @@ int ff_mov_cenc_av1_write_obus(AVFormatContext *s, MOVMuxCencContext* ctx, frame_header = &obu->obu.frame.header; fh_data = unit->data; fh_data_size = unit->data_size; - // fall-through + av_fallthrough; case AV1_OBU_TILE_GROUP: { const AV1RawTileGroup *tile_group; diff --git a/libavformat/options.c b/libavformat/options.c index 72a6a5a43e..9365a16e1d 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -26,6 +26,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/codec_par.h" +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/iamf.h" #include "libavutil/internal.h" @@ -395,7 +396,7 @@ static const AVClass *stream_group_child_iterate(void **opaque) switch(i) { case AV_STREAM_GROUP_PARAMS_NONE: i++; - // fall-through + av_fallthrough; case AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT: ret = av_iamf_audio_element_get_class(); break; diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 1d4b00a0f4..25b1f8640d 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "libavutil/attributes.h" #include "mpegts.h" #include "internal.h" #include "mux.h" @@ -630,7 +631,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size); break; } - /* Fallthrough */ + av_fallthrough; case AV_CODEC_ID_H263P: ff_rtp_send_h263(s1, pkt->data, size); break; @@ -669,7 +670,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) size, s->max_payload_size); return AVERROR(EINVAL); } - /* Intentional fallthrough */ + av_fallthrough; default: /* better than nothing : send the codec raw data */ rtp_send_raw(s1, pkt->data, size); diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 0e3d860d9f..71cbad2dae 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include "libavutil/attributes.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" @@ -1118,7 +1119,7 @@ static int generate_interval(void *log, struct sbg_script *s, case SBG_TYPE_SPIN: av_log(log, AV_LOG_WARNING, "Spinning noise not implemented, " "using pink noise instead.\n"); - /* fall through */ + av_fallthrough; case SBG_TYPE_NOISE: /* SBaGen's pink noise generator uses: - 1 band of white noise, mean square: 1/3; diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c index 4f011ad67a..7210f6cd14 100644 --- a/libavformat/tls_libtls.c +++ b/libavformat/tls_libtls.c @@ -22,6 +22,7 @@ #include "avformat.h" #include "internal.h" +#include "libavutil/attributes.h" #include "network.h" #include "url.h" #include "tls.h" @@ -140,7 +141,7 @@ err_config: err_ctx: av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx)); ret = AVERROR(EIO); - /* fallthrough */ + av_fallthrough; fail: if (cfg) tls_config_free(cfg); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
