[FFmpeg-cvslog] avformat: Make init function out of write_header functions if possible
Andreas Rheinhardt
git at videolan.org
Sat Mar 23 01:33:32 EET 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Mar 20 00:51:30 2024 +0100| [073251316e1b0e4174a5aea41e8a3ce25590b165] | committer: Andreas Rheinhardt
avformat: Make init function out of write_header functions if possible
Also mark them as av_cold while just at it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=073251316e1b0e4174a5aea41e8a3ce25590b165
---
libavformat/bit.c | 4 ++--
libavformat/chromaprint.c | 4 ++--
libavformat/filmstripenc.c | 4 ++--
libavformat/gif.c | 4 ++--
libavformat/supenc.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavformat/bit.c b/libavformat/bit.c
index cd088b87ff..5c3eb31c57 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -125,7 +125,7 @@ const FFInputFormat ff_bit_demuxer = {
#endif
#if CONFIG_BIT_MUXER
-static int write_header(AVFormatContext *s)
+static av_cold int init(AVFormatContext *s)
{
AVCodecParameters *par = s->streams[0]->codecpar;
@@ -170,7 +170,7 @@ const FFOutputFormat ff_bit_muxer = {
.p.subtitle_codec = AV_CODEC_ID_NONE,
.flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH |
FF_OFMT_FLAG_ONLY_DEFAULT_CODECS,
- .write_header = write_header,
+ .init = init,
.write_packet = write_packet,
};
#endif
diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index 4beb75c7a9..1cdca47ea5 100644
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -58,7 +58,7 @@ static void deinit(AVFormatContext *s)
}
}
-static int write_header(AVFormatContext *s)
+static av_cold int init(AVFormatContext *s)
{
ChromaprintMuxContext *cpr = s->priv_data;
AVStream *st;
@@ -181,7 +181,7 @@ const FFOutputFormat ff_chromaprint_muxer = {
.p.subtitle_codec = AV_CODEC_ID_NONE,
.flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH |
FF_OFMT_FLAG_ONLY_DEFAULT_CODECS,
- .write_header = write_header,
+ .init = init,
.write_packet = write_packet,
.write_trailer = write_trailer,
.deinit = deinit,
diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c
index ec9c814f8c..b5d9179ff3 100644
--- a/libavformat/filmstripenc.c
+++ b/libavformat/filmstripenc.c
@@ -32,7 +32,7 @@
#define RAND_TAG MKBETAG('R','a','n','d')
-static int write_header(AVFormatContext *s)
+static av_cold int init(AVFormatContext *s)
{
if (s->streams[0]->codecpar->format != AV_PIX_FMT_RGBA) {
av_log(s, AV_LOG_ERROR, "only AV_PIX_FMT_RGBA is supported\n");
@@ -69,7 +69,7 @@ const FFOutputFormat ff_filmstrip_muxer = {
.p.subtitle_codec = AV_CODEC_ID_NONE,
.flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH |
FF_OFMT_FLAG_ONLY_DEFAULT_CODECS,
- .write_header = write_header,
+ .init = init,
.write_packet = ff_raw_write_packet,
.write_trailer = write_trailer,
};
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 8264e118c6..211705facc 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -40,7 +40,7 @@ typedef struct GIFContext {
AVPacket *prev_pkt;
} GIFContext;
-static int gif_write_header(AVFormatContext *s)
+static av_cold int gif_init(AVFormatContext *s)
{
avpriv_set_pts_info(s->streams[0], 64, 1, 100);
@@ -208,7 +208,7 @@ const FFOutputFormat ff_gif_muxer = {
.p.subtitle_codec = AV_CODEC_ID_NONE,
.flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH |
FF_OFMT_FLAG_ONLY_DEFAULT_CODECS,
- .write_header = gif_write_header,
+ .init = gif_init,
.write_packet = gif_write_packet,
.write_trailer = gif_write_trailer,
.p.priv_class = &gif_muxer_class,
diff --git a/libavformat/supenc.c b/libavformat/supenc.c
index 9d5ca51894..ebdfc7c939 100644
--- a/libavformat/supenc.c
+++ b/libavformat/supenc.c
@@ -72,7 +72,7 @@ static int sup_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
-static int sup_write_header(AVFormatContext *s)
+static av_cold int sup_init(AVFormatContext *s)
{
avpriv_set_pts_info(s->streams[0], 32, 1, 90000);
@@ -89,6 +89,6 @@ const FFOutputFormat ff_sup_muxer = {
.p.subtitle_codec = AV_CODEC_ID_HDMV_PGS_SUBTITLE,
.p.flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
.flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH,
- .write_header = sup_write_header,
+ .init = sup_init,
.write_packet = sup_write_packet,
};
More information about the ffmpeg-cvslog
mailing list