Browse Source

avformat/internal: Move FF_FMT_INIT_CLEANUP to demux.h

and rename it to FF_INFMT_INIT_CLEANUP. This flag is demuxer-only,
so this is the more appropriate place for it.
This does not preclude adding internal flags common to both
demuxer and muxer in the future.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Andreas Rheinhardt 1 year ago
parent
commit
4a4dcde339

+ 1 - 1
libavdevice/lavfi.c

@@ -503,5 +503,5 @@ const FFInputFormat ff_lavfi_demuxer = {
     .read_header    = lavfi_read_header,
     .read_packet    = lavfi_read_packet,
     .read_close     = lavfi_read_close,
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
 };

+ 1 - 1
libavformat/4xm.c

@@ -401,7 +401,7 @@ const FFInputFormat ff_fourxm_demuxer = {
     .p.name         = "4xm",
     .p.long_name    = NULL_IF_CONFIG_SMALL("4X Technologies"),
     .priv_data_size = sizeof(FourxmDemuxContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = fourxm_probe,
     .read_header    = fourxm_read_header,
     .read_packet    = fourxm_read_packet,

+ 1 - 1
libavformat/aadec.c

@@ -383,5 +383,5 @@ const FFInputFormat ff_aa_demuxer = {
     .read_packet    = aa_read_packet,
     .read_seek      = aa_read_seek,
     .read_close     = aa_read_close,
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
 };

+ 1 - 1
libavformat/aaxdec.c

@@ -389,7 +389,7 @@ const FFInputFormat ff_aax_demuxer = {
     .p.extensions   = "aax",
     .p.flags        = AVFMT_GENERIC_INDEX,
     .priv_data_size = sizeof(AAXContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = aax_probe,
     .read_header    = aax_read_header,
     .read_packet    = aax_read_packet,

+ 1 - 1
libavformat/ape.c

@@ -450,7 +450,7 @@ const FFInputFormat ff_ape_demuxer = {
     .p.long_name    = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
     .p.extensions   = "ape,apl,mac",
     .priv_data_size = sizeof(APEContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = ape_probe,
     .read_header    = ape_read_header,
     .read_packet    = ape_read_packet,

+ 1 - 1
libavformat/aqtitledec.c

@@ -142,7 +142,7 @@ const FFInputFormat ff_aqtitle_demuxer = {
     .p.extensions   = "aqt",
     .p.priv_class   = &aqt_class,
     .priv_data_size = sizeof(AQTitleContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = aqt_probe,
     .read_header    = aqt_read_header,
     .read_packet    = aqt_read_packet,

+ 1 - 1
libavformat/assdec.c

@@ -164,7 +164,7 @@ end:
 const FFInputFormat ff_ass_demuxer = {
     .p.name         = "ass",
     .p.long_name    = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .priv_data_size = sizeof(ASSContext),
     .read_probe     = ass_probe,
     .read_header    = ass_read_header,

+ 2 - 2
libavformat/av1dec.c

@@ -289,7 +289,7 @@ const FFInputFormat ff_av1_demuxer = {
     .p.flags        = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS,
     .p.priv_class   = &av1_demuxer_class,
     .priv_data_size = sizeof(AV1DemuxContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = annexb_probe,
     .read_header    = av1_read_header,
     .read_packet    = annexb_read_packet,
@@ -434,7 +434,7 @@ const FFInputFormat ff_obu_demuxer = {
     .p.flags        = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
     .p.priv_class   = &av1_demuxer_class,
     .priv_data_size = sizeof(AV1DemuxContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = obu_probe,
     .read_header    = av1_read_header,
     .read_packet    = obu_read_packet,

+ 1 - 1
libavformat/avidec.c

@@ -2022,7 +2022,7 @@ const FFInputFormat ff_avi_demuxer = {
     .p.extensions   = "avi",
     .p.priv_class   = &demuxer_class,
     .priv_data_size = sizeof(AVIContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = avi_probe,
     .read_header    = avi_read_header,
     .read_packet    = avi_read_packet,

+ 2 - 2
libavformat/brstm.c

@@ -472,7 +472,7 @@ const FFInputFormat ff_brstm_demuxer = {
     .p.long_name    = NULL_IF_CONFIG_SMALL("BRSTM (Binary Revolution Stream)"),
     .p.extensions   = "brstm",
     .priv_data_size = sizeof(BRSTMDemuxContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = probe,
     .read_header    = read_header,
     .read_packet    = read_packet,
@@ -485,7 +485,7 @@ const FFInputFormat ff_bfstm_demuxer = {
     .p.long_name    = NULL_IF_CONFIG_SMALL("BFSTM (Binary Cafe Stream)"),
     .p.extensions   = "bfstm,bcstm",
     .priv_data_size = sizeof(BRSTMDemuxContext),
-    .flags_internal = FF_FMT_INIT_CLEANUP,
+    .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
     .read_probe     = probe_bfstm,
     .read_header    = read_header,
     .read_packet    = read_packet,

Some files were not shown because too many files changed in this diff