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.
Unified · Split
| @@ -503,5 +503,5 @@ const FFInputFormat ff_lavfi_demuxer = { · 502 unmodified lines | ||
| 503 | 503 | .read_header = lavfi_read_header, |
| 504 | 504 | .read_packet = lavfi_read_packet, |
| 505 | 505 | .read_close = lavfi_read_close, |
| 506 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 506 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 507 | 507 | }; |
| @@ -401,7 +401,7 @@ const FFInputFormat ff_fourxm_demuxer = { · 400 unmodified lines | ||
| 401 | 401 | .p.name = "4xm", |
| 402 | 402 | .p.long_name = NULL_IF_CONFIG_SMALL("4X Technologies"), |
| 403 | 403 | .priv_data_size = sizeof(FourxmDemuxContext), |
| 404 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 404 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 405 | 405 | .read_probe = fourxm_probe, |
| 406 | 406 | .read_header = fourxm_read_header, |
| 407 | 407 | .read_packet = fourxm_read_packet, |
| @@ -383,5 +383,5 @@ const FFInputFormat ff_aa_demuxer = { · 382 unmodified lines | ||
| 383 | 383 | .read_packet = aa_read_packet, |
| 384 | 384 | .read_seek = aa_read_seek, |
| 385 | 385 | .read_close = aa_read_close, |
| 386 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 386 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 387 | 387 | }; |
| @@ -389,7 +389,7 @@ const FFInputFormat ff_aax_demuxer = { · 388 unmodified lines | ||
| 389 | 389 | .p.extensions = "aax", |
| 390 | 390 | .p.flags = AVFMT_GENERIC_INDEX, |
| 391 | 391 | .priv_data_size = sizeof(AAXContext), |
| 392 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 392 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 393 | 393 | .read_probe = aax_probe, |
| 394 | 394 | .read_header = aax_read_header, |
| 395 | 395 | .read_packet = aax_read_packet, |
| @@ -450,7 +450,7 @@ const FFInputFormat ff_ape_demuxer = { · 449 unmodified lines | ||
| 450 | 450 | .p.long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), |
| 451 | 451 | .p.extensions = "ape,apl,mac", |
| 452 | 452 | .priv_data_size = sizeof(APEContext), |
| 453 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 453 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 454 | 454 | .read_probe = ape_probe, |
| 455 | 455 | .read_header = ape_read_header, |
| 456 | 456 | .read_packet = ape_read_packet, |
| @@ -142,7 +142,7 @@ const FFInputFormat ff_aqtitle_demuxer = { · 141 unmodified lines | ||
| 142 | 142 | .p.extensions = "aqt", |
| 143 | 143 | .p.priv_class = &aqt_class, |
| 144 | 144 | .priv_data_size = sizeof(AQTitleContext), |
| 145 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 145 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 146 | 146 | .read_probe = aqt_probe, |
| 147 | 147 | .read_header = aqt_read_header, |
| 148 | 148 | .read_packet = aqt_read_packet, |
| @@ -164,7 +164,7 @@ end: · 163 unmodified lines | ||
| 164 | 164 | const FFInputFormat ff_ass_demuxer = { |
| 165 | 165 | .p.name = "ass", |
| 166 | 166 | .p.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), |
| 167 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 167 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 168 | 168 | .priv_data_size = sizeof(ASSContext), |
| 169 | 169 | .read_probe = ass_probe, |
| 170 | 170 | .read_header = ass_read_header, |
| @@ -289,7 +289,7 @@ const FFInputFormat ff_av1_demuxer = { · 288 unmodified lines | ||
| 289 | 289 | .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, |
| 290 | 290 | .p.priv_class = &av1_demuxer_class, |
| 291 | 291 | .priv_data_size = sizeof(AV1DemuxContext), |
| 292 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 292 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 293 | 293 | .read_probe = annexb_probe, |
| 294 | 294 | .read_header = av1_read_header, |
| 295 | 295 | .read_packet = annexb_read_packet, |
| @@ -434,7 +434,7 @@ const FFInputFormat ff_obu_demuxer = { · 138 unmodified lines | ||
| 434 | 434 | .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS, |
| 435 | 435 | .p.priv_class = &av1_demuxer_class, |
| 436 | 436 | .priv_data_size = sizeof(AV1DemuxContext), |
| 437 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 437 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 438 | 438 | .read_probe = obu_probe, |
| 439 | 439 | .read_header = av1_read_header, |
| 440 | 440 | .read_packet = obu_read_packet, |
| @@ -2022,7 +2022,7 @@ const FFInputFormat ff_avi_demuxer = { · 2021 unmodified lines | ||
| 2022 | 2022 | .p.extensions = "avi", |
| 2023 | 2023 | .p.priv_class = &demuxer_class, |
| 2024 | 2024 | .priv_data_size = sizeof(AVIContext), |
| 2025 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 2025 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 2026 | 2026 | .read_probe = avi_probe, |
| 2027 | 2027 | .read_header = avi_read_header, |
| 2028 | 2028 | .read_packet = avi_read_packet, |
| @@ -472,7 +472,7 @@ const FFInputFormat ff_brstm_demuxer = { · 471 unmodified lines | ||
| 472 | 472 | .p.long_name = NULL_IF_CONFIG_SMALL("BRSTM (Binary Revolution Stream)"), |
| 473 | 473 | .p.extensions = "brstm", |
| 474 | 474 | .priv_data_size = sizeof(BRSTMDemuxContext), |
| 475 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 475 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 476 | 476 | .read_probe = probe, |
| 477 | 477 | .read_header = read_header, |
| 478 | 478 | .read_packet = read_packet, |
| @@ -485,7 +485,7 @@ const FFInputFormat ff_bfstm_demuxer = { · 6 unmodified lines | ||
| 485 | 485 | .p.long_name = NULL_IF_CONFIG_SMALL("BFSTM (Binary Cafe Stream)"), |
| 486 | 486 | .p.extensions = "bfstm,bcstm", |
| 487 | 487 | .priv_data_size = sizeof(BRSTMDemuxContext), |
| 488 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 488 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 489 | 489 | .read_probe = probe_bfstm, |
| 490 | 490 | .read_header = read_header, |
| 491 | 491 | .read_packet = read_packet, |
| @@ -947,7 +947,7 @@ const FFInputFormat ff_concat_demuxer = { · 946 unmodified lines | ||
| 947 | 947 | .p.long_name = NULL_IF_CONFIG_SMALL("Virtual concatenation script"), |
| 948 | 948 | .p.priv_class = &concat_class, |
| 949 | 949 | .priv_data_size = sizeof(ConcatContext), |
| 950 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 950 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 951 | 951 | .read_probe = concat_probe, |
| 952 | 952 | .read_header = concat_read_header, |
| 953 | 953 | .read_packet = concat_read_packet, |
| @@ -2361,7 +2361,7 @@ const FFInputFormat ff_dash_demuxer = { · 2360 unmodified lines | ||
| 2361 | 2361 | .p.priv_class = &dash_class, |
| 2362 | 2362 | .p.flags = AVFMT_NO_BYTE_SEEK, |
| 2363 | 2363 | .priv_data_size = sizeof(DASHContext), |
| 2364 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 2364 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 2365 | 2365 | .read_probe = dash_probe, |
| 2366 | 2366 | .read_header = dash_read_header, |
| 2367 | 2367 | .read_packet = dash_read_packet, |
| @@ -302,7 +302,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, · 301 unmodified lines | ||
| 302 | 302 | |
| 303 | 303 | if (ffifmt(s->iformat)->read_header) |
| 304 | 304 | if ((ret = ffifmt(s->iformat)->read_header(s)) < 0) { |
| 305 | − if (ffifmt(s->iformat)->flags_internal & FF_FMT_INIT_CLEANUP) | |
| 305 | + if (ffifmt(s->iformat)->flags_internal & FF_INFMT_FLAG_INIT_CLEANUP) | |
| 306 | 306 | goto close; |
| 307 | 307 | goto fail; |
| 308 | 308 | } |
| @@ -28,6 +28,12 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | struct AVDeviceInfoList; |
| 30 | 30 | |
| 31 | +/** | |
| 32 | + * For an FFInputFormat with this flag set read_close() needs to be called | |
| 33 | + * by the caller upon read_header() failure. | |
| 34 | + */ | |
| 35 | +#define FF_INFMT_FLAG_INIT_CLEANUP (1 << 0) | |
| 36 | + | |
| 31 | 37 | typedef struct FFInputFormat { |
| 32 | 38 | /** |
| 33 | 39 | * The public AVInputFormat. See avformat.h for it. |
| @@ -45,7 +51,7 @@ typedef struct FFInputFormat { · 11 unmodified lines | ||
| 45 | 51 | int priv_data_size; |
| 46 | 52 | |
| 47 | 53 | /** |
| 48 | − * Internal flags. See FF_FMT_FLAG_* in internal.h. | |
| 54 | + * Internal flags. See FF_INFMT_FLAG_* above and FF_FMT_FLAG_* in internal.h. | |
| 49 | 55 | */ |
| 50 | 56 | int flags_internal; |
| 51 | 57 | |
| @@ -1705,7 +1705,7 @@ const FFInputFormat ff_dvdvideo_demuxer = { · 1704 unmodified lines | ||
| 1705 | 1705 | .p.flags = AVFMT_NOFILE | AVFMT_SHOW_IDS | AVFMT_TS_DISCONT | |
| 1706 | 1706 | AVFMT_NO_BYTE_SEEK | AVFMT_NOGENSEARCH | AVFMT_NOBINSEARCH, |
| 1707 | 1707 | .priv_data_size = sizeof(DVDVideoDemuxContext), |
| 1708 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1708 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1709 | 1709 | .read_close = dvdvideo_close, |
| 1710 | 1710 | .read_header = dvdvideo_read_header, |
| 1711 | 1711 | .read_packet = dvdvideo_read_packet |
| @@ -212,7 +212,7 @@ const FFInputFormat ff_evc_demuxer = { · 211 unmodified lines | ||
| 212 | 212 | .read_header = evc_read_header, // annexb_read_header |
| 213 | 213 | .read_packet = evc_read_packet, // annexb_read_packet |
| 214 | 214 | .read_close = evc_read_close, |
| 215 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 215 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 216 | 216 | .raw_codec_id = AV_CODEC_ID_EVC, |
| 217 | 217 | .priv_data_size = sizeof(EVCDemuxContext), |
| 218 | 218 | }; |
| @@ -2602,7 +2602,7 @@ const FFInputFormat ff_hls_demuxer = { · 2601 unmodified lines | ||
| 2602 | 2602 | .p.priv_class = &hls_class, |
| 2603 | 2603 | .p.flags = AVFMT_NOGENSEARCH | AVFMT_TS_DISCONT | AVFMT_NO_BYTE_SEEK, |
| 2604 | 2604 | .priv_data_size = sizeof(HLSContext), |
| 2605 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 2605 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 2606 | 2606 | .read_probe = hls_probe, |
| 2607 | 2607 | .read_header = hls_read_header, |
| 2608 | 2608 | .read_packet = hls_read_packet, |
| @@ -184,7 +184,7 @@ const FFInputFormat ff_iamf_demuxer = { · 183 unmodified lines | ||
| 184 | 184 | .p.extensions = "iamf", |
| 185 | 185 | .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS | AVFMT_SHOW_IDS, |
| 186 | 186 | .priv_data_size = sizeof(IAMFDemuxContext), |
| 187 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 187 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 188 | 188 | .read_probe = iamf_probe, |
| 189 | 189 | .read_header = iamf_read_header, |
| 190 | 190 | .read_packet = iamf_read_packet, |
| @@ -222,7 +222,7 @@ const FFInputFormat ff_ico_demuxer = { · 221 unmodified lines | ||
| 222 | 222 | .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft Windows ICO"), |
| 223 | 223 | .p.flags = AVFMT_NOTIMESTAMPS, |
| 224 | 224 | .priv_data_size = sizeof(IcoDemuxContext), |
| 225 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 225 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 226 | 226 | .read_probe = probe, |
| 227 | 227 | .read_header = read_header, |
| 228 | 228 | .read_packet = read_packet, |
| @@ -1019,7 +1019,7 @@ const FFInputFormat ff_imf_demuxer = { · 1018 unmodified lines | ||
| 1019 | 1019 | .p.long_name = NULL_IF_CONFIG_SMALL("IMF (Interoperable Master Format)"), |
| 1020 | 1020 | .p.flags = AVFMT_NO_BYTE_SEEK, |
| 1021 | 1021 | .p.priv_class = &imf_class, |
| 1022 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1022 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1023 | 1023 | .priv_data_size = sizeof(IMFContext), |
| 1024 | 1024 | .read_probe = imf_probe, |
| 1025 | 1025 | .read_header = imf_read_header, |
| @@ -39,12 +39,6 @@ · 38 unmodified lines | ||
| 39 | 39 | # define hex_dump_debug(class, buf, size) do { if (0) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size); } while(0) |
| 40 | 40 | #endif |
| 41 | 41 | |
| 42 | −/** | |
| 43 | − * For an FFInputFormat with this flag set read_close() needs to be called | |
| 44 | − * by the caller upon read_header() failure. | |
| 45 | − */ | |
| 46 | −#define FF_FMT_INIT_CLEANUP (1 << 0) | |
| 47 | − | |
| 48 | 42 | typedef struct AVCodecTag { |
| 49 | 43 | enum AVCodecID id; |
| 50 | 44 | unsigned int tag; |
| @@ -261,7 +261,7 @@ const FFInputFormat ff_jacosub_demuxer = { · 260 unmodified lines | ||
| 261 | 261 | .p.name = "jacosub", |
| 262 | 262 | .p.long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle format"), |
| 263 | 263 | .priv_data_size = sizeof(JACOsubContext), |
| 264 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 264 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 265 | 265 | .read_probe = jacosub_probe, |
| 266 | 266 | .read_header = jacosub_read_header, |
| 267 | 267 | .read_packet = ff_subtitles_read_packet, |
| @@ -202,5 +202,5 @@ const FFInputFormat ff_jpegxl_anim_demuxer = { · 201 unmodified lines | ||
| 202 | 202 | .read_header = jpegxl_anim_read_header, |
| 203 | 203 | .read_packet = jpegxl_anim_read_packet, |
| 204 | 204 | .read_close = jpegxl_anim_close, |
| 205 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 205 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 206 | 206 | }; |
| @@ -255,7 +255,7 @@ const FFInputFormat ff_jv_demuxer = { · 254 unmodified lines | ||
| 255 | 255 | .p.name = "jv", |
| 256 | 256 | .p.long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"), |
| 257 | 257 | .priv_data_size = sizeof(JVDemuxContext), |
| 258 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 258 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 259 | 259 | .read_probe = read_probe, |
| 260 | 260 | .read_header = read_header, |
| 261 | 261 | .read_packet = read_packet, |
| @@ -289,5 +289,5 @@ const FFInputFormat ff_laf_demuxer = { · 288 unmodified lines | ||
| 289 | 289 | .read_packet = laf_read_packet, |
| 290 | 290 | .read_close = laf_read_close, |
| 291 | 291 | .read_seek = laf_read_seek, |
| 292 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 292 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 293 | 293 | }; |
| @@ -199,7 +199,7 @@ const FFInputFormat ff_libgme_demuxer = { · 198 unmodified lines | ||
| 199 | 199 | .p.long_name = NULL_IF_CONFIG_SMALL("Game Music Emu demuxer"), |
| 200 | 200 | .p.priv_class = &class_gme, |
| 201 | 201 | .priv_data_size = sizeof(GMEContext), |
| 202 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 202 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 203 | 203 | .read_probe = probe_gme, |
| 204 | 204 | .read_header = read_header_gme, |
| 205 | 205 | .read_packet = read_packet_gme, |
| @@ -289,7 +289,7 @@ const FFInputFormat ff_libopenmpt_demuxer = { · 288 unmodified lines | ||
| 289 | 289 | .p.extensions = "669,amf,ams,dbm,digi,dmf,dsm,far,gdm,ice,imf,it,j2b,m15,mdl,med,mmcmp,mms,mo3,mod,mptm,mt2,mtm,nst,okt,plm,ppm,psm,pt36,ptm,s3m,sfx,sfx2,st26,stk,stm,ult,umx,wow,xm,xpk", |
| 290 | 290 | #endif |
| 291 | 291 | .priv_data_size = sizeof(OpenMPTContext), |
| 292 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 292 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 293 | 293 | .read_probe = read_probe_openmpt, |
| 294 | 294 | .read_header = read_header_openmpt, |
| 295 | 295 | .read_packet = read_packet_openmpt, |
| @@ -229,7 +229,7 @@ const FFInputFormat ff_lrc_demuxer = { · 228 unmodified lines | ||
| 229 | 229 | .p.name = "lrc", |
| 230 | 230 | .p.long_name = NULL_IF_CONFIG_SMALL("LRC lyrics"), |
| 231 | 231 | .priv_data_size = sizeof (LRCContext), |
| 232 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 232 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 233 | 233 | .read_probe = lrc_probe, |
| 234 | 234 | .read_header = lrc_read_header, |
| 235 | 235 | .read_packet = ff_subtitles_read_packet, |
| @@ -4792,7 +4792,7 @@ const FFInputFormat ff_webm_dash_manifest_demuxer = { · 4791 unmodified lines | ||
| 4792 | 4792 | .p.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"), |
| 4793 | 4793 | .p.priv_class = &webm_dash_class, |
| 4794 | 4794 | .priv_data_size = sizeof(MatroskaDemuxContext), |
| 4795 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 4795 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 4796 | 4796 | .read_header = webm_dash_manifest_read_header, |
| 4797 | 4797 | .read_packet = webm_dash_manifest_read_packet, |
| 4798 | 4798 | .read_close = matroska_read_close, |
| @@ -4805,7 +4805,7 @@ const FFInputFormat ff_matroska_demuxer = { · 6 unmodified lines | ||
| 4805 | 4805 | .p.extensions = "mkv,mk3d,mka,mks,webm", |
| 4806 | 4806 | .p.mime_type = "audio/webm,audio/x-matroska,video/webm,video/x-matroska", |
| 4807 | 4807 | .priv_data_size = sizeof(MatroskaDemuxContext), |
| 4808 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 4808 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 4809 | 4809 | .read_probe = matroska_probe, |
| 4810 | 4810 | .read_header = matroska_read_header, |
| 4811 | 4811 | .read_packet = matroska_read_packet, |
| @@ -206,7 +206,7 @@ const FFInputFormat ff_mcc_demuxer = { · 205 unmodified lines | ||
| 206 | 206 | .p.long_name = NULL_IF_CONFIG_SMALL("MacCaption"), |
| 207 | 207 | .p.extensions = "mcc", |
| 208 | 208 | .priv_data_size = sizeof(MCCContext), |
| 209 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 209 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 210 | 210 | .read_probe = mcc_probe, |
| 211 | 211 | .read_header = mcc_read_header, |
| 212 | 212 | .read_packet = ff_subtitles_read_packet, |
| @@ -204,7 +204,7 @@ const FFInputFormat ff_microdvd_demuxer = { · 203 unmodified lines | ||
| 204 | 204 | .p.long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle format"), |
| 205 | 205 | .p.priv_class = µdvd_class, |
| 206 | 206 | .priv_data_size = sizeof(MicroDVDContext), |
| 207 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 207 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 208 | 208 | .read_probe = microdvd_probe, |
| 209 | 209 | .read_header = microdvd_read_header, |
| 210 | 210 | .read_packet = microdvd_read_packet, |
| @@ -492,7 +492,7 @@ const FFInputFormat ff_mlv_demuxer = { · 491 unmodified lines | ||
| 492 | 492 | .p.name = "mlv", |
| 493 | 493 | .p.long_name = NULL_IF_CONFIG_SMALL("Magic Lantern Video (MLV)"), |
| 494 | 494 | .priv_data_size = sizeof(MlvContext), |
| 495 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 495 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 496 | 496 | .read_probe = probe, |
| 497 | 497 | .read_header = read_header, |
| 498 | 498 | .read_packet = read_packet, |
| @@ -383,5 +383,5 @@ const FFInputFormat ff_moflex_demuxer = { · 382 unmodified lines | ||
| 383 | 383 | .read_packet = moflex_read_packet, |
| 384 | 384 | .read_seek = moflex_read_seek, |
| 385 | 385 | .read_close = moflex_read_close, |
| 386 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 386 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 387 | 387 | }; |
| @@ -10308,7 +10308,7 @@ const FFInputFormat ff_mov_demuxer = { · 10307 unmodified lines | ||
| 10308 | 10308 | .p.extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif,heic,heif", |
| 10309 | 10309 | .p.flags = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS | AVFMT_SHOW_IDS, |
| 10310 | 10310 | .priv_data_size = sizeof(MOVContext), |
| 10311 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 10311 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 10312 | 10312 | .read_probe = mov_probe, |
| 10313 | 10313 | .read_header = mov_read_header, |
| 10314 | 10314 | .read_packet = mov_read_packet, |
| @@ -1055,7 +1055,7 @@ const FFInputFormat ff_vobsub_demuxer = { · 1054 unmodified lines | ||
| 1055 | 1055 | .p.extensions = "idx", |
| 1056 | 1056 | .p.priv_class = &vobsub_demuxer_class, |
| 1057 | 1057 | .priv_data_size = sizeof(VobSubDemuxContext), |
| 1058 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1058 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1059 | 1059 | .read_probe = vobsub_probe, |
| 1060 | 1060 | .read_header = vobsub_read_header, |
| 1061 | 1061 | .read_packet = vobsub_read_packet, |
| @@ -128,7 +128,7 @@ const FFInputFormat ff_mpl2_demuxer = { · 127 unmodified lines | ||
| 128 | 128 | .p.long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitles"), |
| 129 | 129 | .p.extensions = "txt,mpl2", |
| 130 | 130 | .priv_data_size = sizeof(MPL2Context), |
| 131 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 131 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 132 | 132 | .read_probe = mpl2_probe, |
| 133 | 133 | .read_header = mpl2_read_header, |
| 134 | 134 | .read_packet = ff_subtitles_read_packet, |
| @@ -176,7 +176,7 @@ const FFInputFormat ff_mpsub_demuxer = { · 175 unmodified lines | ||
| 176 | 176 | .p.long_name = NULL_IF_CONFIG_SMALL("MPlayer subtitles"), |
| 177 | 177 | .p.extensions = "sub", |
| 178 | 178 | .priv_data_size = sizeof(MPSubContext), |
| 179 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 179 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 180 | 180 | .read_probe = mpsub_probe, |
| 181 | 181 | .read_header = mpsub_read_header, |
| 182 | 182 | .read_packet = ff_subtitles_read_packet, |
| @@ -4265,7 +4265,7 @@ const FFInputFormat ff_mxf_demuxer = { · 4264 unmodified lines | ||
| 4265 | 4265 | .p.flags = AVFMT_SEEK_TO_PTS, |
| 4266 | 4266 | .p.priv_class = &demuxer_class, |
| 4267 | 4267 | .priv_data_size = sizeof(MXFContext), |
| 4268 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 4268 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 4269 | 4269 | .read_probe = mxf_probe, |
| 4270 | 4270 | .read_header = mxf_read_header, |
| 4271 | 4271 | .read_packet = mxf_read_packet, |
| @@ -752,7 +752,7 @@ const FFInputFormat ff_nsv_demuxer = { · 751 unmodified lines | ||
| 752 | 752 | .p.name = "nsv", |
| 753 | 753 | .p.long_name = NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"), |
| 754 | 754 | .priv_data_size = sizeof(NSVContext), |
| 755 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 755 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 756 | 756 | .read_probe = nsv_probe, |
| 757 | 757 | .read_header = nsv_read_header, |
| 758 | 758 | .read_packet = nsv_read_packet, |
| @@ -1313,7 +1313,7 @@ const FFInputFormat ff_nut_demuxer = { · 1312 unmodified lines | ||
| 1313 | 1313 | .p.extensions = "nut", |
| 1314 | 1314 | .p.codec_tag = ff_nut_codec_tags, |
| 1315 | 1315 | .priv_data_size = sizeof(NUTContext), |
| 1316 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1316 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1317 | 1317 | .read_probe = nut_probe, |
| 1318 | 1318 | .read_header = nut_read_header, |
| 1319 | 1319 | .read_packet = nut_read_packet, |
| @@ -966,7 +966,7 @@ const FFInputFormat ff_ogg_demuxer = { · 965 unmodified lines | ||
| 966 | 966 | .p.extensions = "ogg", |
| 967 | 967 | .p.flags = AVFMT_GENERIC_INDEX | AVFMT_TS_DISCONT | AVFMT_NOBINSEARCH, |
| 968 | 968 | .priv_data_size = sizeof(struct ogg), |
| 969 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 969 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 970 | 970 | .read_probe = ogg_probe, |
| 971 | 971 | .read_header = ogg_read_header, |
| 972 | 972 | .read_packet = ogg_read_packet, |
| @@ -615,7 +615,7 @@ const FFInputFormat ff_oma_demuxer = { · 614 unmodified lines | ||
| 615 | 615 | .p.extensions = "oma,omg,aa3", |
| 616 | 616 | .p.codec_tag = ff_oma_codec_tags_list, |
| 617 | 617 | .priv_data_size = sizeof(OMAContext), |
| 618 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 618 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 619 | 619 | .read_probe = oma_read_probe, |
| 620 | 620 | .read_header = oma_read_header, |
| 621 | 621 | .read_packet = oma_read_packet, |
| @@ -270,7 +270,7 @@ const FFInputFormat ff_paf_demuxer = { · 269 unmodified lines | ||
| 270 | 270 | .p.name = "paf", |
| 271 | 271 | .p.long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File"), |
| 272 | 272 | .priv_data_size = sizeof(PAFDemuxContext), |
| 273 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 273 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 274 | 274 | .read_probe = read_probe, |
| 275 | 275 | .read_header = read_header, |
| 276 | 276 | .read_packet = read_packet, |
| @@ -165,7 +165,7 @@ const FFInputFormat ff_pdv_demuxer = { · 164 unmodified lines | ||
| 165 | 165 | .p.long_name = NULL_IF_CONFIG_SMALL("PlayDate Video"), |
| 166 | 166 | .p.extensions = "pdv", |
| 167 | 167 | .priv_data_size = sizeof(PDVDemuxContext), |
| 168 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 168 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 169 | 169 | .read_probe = pdv_probe, |
| 170 | 170 | .read_header = pdv_read_header, |
| 171 | 171 | .read_packet = pdv_read_packet, |
| @@ -111,7 +111,7 @@ const FFInputFormat ff_pjs_demuxer = { · 110 unmodified lines | ||
| 111 | 111 | .p.long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitles"), |
| 112 | 112 | .p.extensions = "pjs", |
| 113 | 113 | .priv_data_size = sizeof(PJSContext), |
| 114 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 114 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 115 | 115 | .read_probe = pjs_probe, |
| 116 | 116 | .read_header = pjs_read_header, |
| 117 | 117 | .read_packet = ff_subtitles_read_packet, |
| @@ -320,7 +320,7 @@ const FFInputFormat ff_pp_bnk_demuxer = { · 319 unmodified lines | ||
| 320 | 320 | .p.name = "pp_bnk", |
| 321 | 321 | .p.long_name = NULL_IF_CONFIG_SMALL("Pro Pinball Series Soundbank"), |
| 322 | 322 | .priv_data_size = sizeof(PPBnkCtx), |
| 323 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 323 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 324 | 324 | .read_probe = pp_bnk_probe, |
| 325 | 325 | .read_header = pp_bnk_read_header, |
| 326 | 326 | .read_packet = pp_bnk_read_packet, |
| @@ -137,7 +137,7 @@ const FFInputFormat ff_realtext_demuxer = { · 136 unmodified lines | ||
| 137 | 137 | .p.long_name = NULL_IF_CONFIG_SMALL("RealText subtitle format"), |
| 138 | 138 | .p.extensions = "rt", |
| 139 | 139 | .priv_data_size = sizeof(RealTextContext), |
| 140 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 140 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 141 | 141 | .read_probe = realtext_probe, |
| 142 | 142 | .read_header = realtext_read_header, |
| 143 | 143 | .read_packet = ff_subtitles_read_packet, |
| @@ -1149,7 +1149,7 @@ const FFInputFormat ff_rm_demuxer = { · 1148 unmodified lines | ||
| 1149 | 1149 | .p.name = "rm", |
| 1150 | 1150 | .p.long_name = NULL_IF_CONFIG_SMALL("RealMedia"), |
| 1151 | 1151 | .priv_data_size = sizeof(RMDemuxContext), |
| 1152 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1152 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1153 | 1153 | .read_probe = rm_probe, |
| 1154 | 1154 | .read_header = rm_read_header, |
| 1155 | 1155 | .read_packet = rm_read_packet, |
| @@ -1403,7 +1403,7 @@ const FFInputFormat ff_ivr_demuxer = { · 247 unmodified lines | ||
| 1403 | 1403 | .p.long_name = NULL_IF_CONFIG_SMALL("IVR (Internet Video Recording)"), |
| 1404 | 1404 | .p.extensions = "ivr", |
| 1405 | 1405 | .priv_data_size = sizeof(RMDemuxContext), |
| 1406 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 1406 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 1407 | 1407 | .read_probe = ivr_probe, |
| 1408 | 1408 | .read_header = ivr_read_header, |
| 1409 | 1409 | .read_packet = ivr_read_packet, |
| @@ -127,7 +127,7 @@ const FFInputFormat ff_sami_demuxer = { · 126 unmodified lines | ||
| 127 | 127 | .p.long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle format"), |
| 128 | 128 | .p.extensions = "smi,sami", |
| 129 | 129 | .priv_data_size = sizeof(SAMIContext), |
| 130 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 130 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 131 | 131 | .read_probe = sami_probe, |
| 132 | 132 | .read_header = sami_read_header, |
| 133 | 133 | .read_packet = ff_subtitles_read_packet, |
| @@ -152,7 +152,7 @@ const FFInputFormat ff_scc_demuxer = { · 151 unmodified lines | ||
| 152 | 152 | .p.long_name = NULL_IF_CONFIG_SMALL("Scenarist Closed Captions"), |
| 153 | 153 | .p.extensions = "scc", |
| 154 | 154 | .priv_data_size = sizeof(SCCContext), |
| 155 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 155 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 156 | 156 | .read_probe = scc_probe, |
| 157 | 157 | .read_header = scc_read_header, |
| 158 | 158 | .read_packet = ff_subtitles_read_packet, |
| @@ -370,7 +370,7 @@ const FFInputFormat ff_scd_demuxer = { · 369 unmodified lines | ||
| 370 | 370 | .p.name = "scd", |
| 371 | 371 | .p.long_name = NULL_IF_CONFIG_SMALL("Square Enix SCD"), |
| 372 | 372 | .priv_data_size = sizeof(SCDDemuxContext), |
| 373 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 373 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 374 | 374 | .read_probe = scd_probe, |
| 375 | 375 | .read_header = scd_read_header, |
| 376 | 376 | .read_packet = scd_read_packet, |
| @@ -329,7 +329,7 @@ const FFInputFormat ff_segafilm_demuxer = { · 328 unmodified lines | ||
| 329 | 329 | .p.name = "film_cpk", |
| 330 | 330 | .p.long_name = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"), |
| 331 | 331 | .priv_data_size = sizeof(FilmDemuxContext), |
| 332 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 332 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 333 | 333 | .read_probe = film_probe, |
| 334 | 334 | .read_header = film_read_header, |
| 335 | 335 | .read_packet = film_read_packet, |
| @@ -318,7 +318,7 @@ const FFInputFormat ff_vmd_demuxer = { · 317 unmodified lines | ||
| 318 | 318 | .p.name = "vmd", |
| 319 | 319 | .p.long_name = NULL_IF_CONFIG_SMALL("Sierra VMD"), |
| 320 | 320 | .priv_data_size = sizeof(VmdDemuxContext), |
| 321 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 321 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 322 | 322 | .read_probe = vmd_probe, |
| 323 | 323 | .read_header = vmd_read_header, |
| 324 | 324 | .read_packet = vmd_read_packet, |
| @@ -218,7 +218,7 @@ const FFInputFormat ff_srt_demuxer = { · 217 unmodified lines | ||
| 218 | 218 | .p.name = "srt", |
| 219 | 219 | .p.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), |
| 220 | 220 | .priv_data_size = sizeof(SRTContext), |
| 221 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 221 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 222 | 222 | .read_probe = srt_probe, |
| 223 | 223 | .read_header = srt_read_header, |
| 224 | 224 | .read_packet = ff_subtitles_read_packet, |
| @@ -114,7 +114,7 @@ const FFInputFormat ff_stl_demuxer = { · 113 unmodified lines | ||
| 114 | 114 | .p.long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), |
| 115 | 115 | .p.extensions = "stl", |
| 116 | 116 | .priv_data_size = sizeof(STLContext), |
| 117 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 117 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 118 | 118 | .read_probe = stl_probe, |
| 119 | 119 | .read_header = stl_read_header, |
| 120 | 120 | .read_packet = ff_subtitles_read_packet, |
| @@ -96,7 +96,7 @@ const FFInputFormat ff_subviewer1_demuxer = { · 95 unmodified lines | ||
| 96 | 96 | .p.long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle format"), |
| 97 | 97 | .p.extensions = "sub", |
| 98 | 98 | .priv_data_size = sizeof(SubViewer1Context), |
| 99 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 99 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 100 | 100 | .read_probe = subviewer1_probe, |
| 101 | 101 | .read_header = subviewer1_read_header, |
| 102 | 102 | .read_packet = ff_subtitles_read_packet, |
| @@ -191,7 +191,7 @@ const FFInputFormat ff_subviewer_demuxer = { · 190 unmodified lines | ||
| 191 | 191 | .p.long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle format"), |
| 192 | 192 | .p.extensions = "sub", |
| 193 | 193 | .priv_data_size = sizeof(SubViewerContext), |
| 194 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 194 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 195 | 195 | .read_probe = subviewer_probe, |
| 196 | 196 | .read_header = subviewer_read_header, |
| 197 | 197 | .read_packet = ff_subtitles_read_packet, |
| @@ -361,7 +361,7 @@ const FFInputFormat ff_tedcaptions_demuxer = { · 360 unmodified lines | ||
| 361 | 361 | .p.long_name = NULL_IF_CONFIG_SMALL("TED Talks captions"), |
| 362 | 362 | .p.priv_class = &tedcaptions_demuxer_class, |
| 363 | 363 | .priv_data_size = sizeof(TEDCaptionsDemuxer), |
| 364 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 364 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 365 | 365 | .read_header = tedcaptions_read_header, |
| 366 | 366 | .read_packet = tedcaptions_read_packet, |
| 367 | 367 | .read_close = tedcaptions_read_close, |
| @@ -312,7 +312,7 @@ const FFInputFormat ff_tiertexseq_demuxer = { · 311 unmodified lines | ||
| 312 | 312 | .p.name = "tiertexseq", |
| 313 | 313 | .p.long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ"), |
| 314 | 314 | .priv_data_size = sizeof(SeqDemuxContext), |
| 315 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 315 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 316 | 316 | .read_probe = seq_probe, |
| 317 | 317 | .read_header = seq_read_header, |
| 318 | 318 | .read_packet = seq_read_packet, |
| @@ -486,7 +486,7 @@ const FFInputFormat ff_vapoursynth_demuxer = { · 485 unmodified lines | ||
| 486 | 486 | .p.long_name = NULL_IF_CONFIG_SMALL("VapourSynth demuxer"), |
| 487 | 487 | .p.priv_class = &class_vs, |
| 488 | 488 | .priv_data_size = sizeof(VSContext), |
| 489 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 489 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 490 | 490 | .read_probe = probe_vs, |
| 491 | 491 | .read_header = read_header_vs, |
| 492 | 492 | .read_packet = read_packet_vs, |
| @@ -795,7 +795,7 @@ const FFInputFormat ff_vividas_demuxer = { · 794 unmodified lines | ||
| 795 | 795 | .p.name = "vividas", |
| 796 | 796 | .p.long_name = NULL_IF_CONFIG_SMALL("Vividas VIV"), |
| 797 | 797 | .priv_data_size = sizeof(VividasDemuxContext), |
| 798 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 798 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 799 | 799 | .read_probe = viv_probe, |
| 800 | 800 | .read_header = viv_read_header, |
| 801 | 801 | .read_packet = viv_read_packet, |
| @@ -101,7 +101,7 @@ const FFInputFormat ff_vplayer_demuxer = { · 100 unmodified lines | ||
| 101 | 101 | .p.long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitles"), |
| 102 | 102 | .p.extensions = "txt", |
| 103 | 103 | .priv_data_size = sizeof(VPlayerContext), |
| 104 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 104 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 105 | 105 | .read_probe = vplayer_probe, |
| 106 | 106 | .read_header = vplayer_read_header, |
| 107 | 107 | .read_packet = ff_subtitles_read_packet, |
| @@ -298,7 +298,7 @@ const FFInputFormat ff_wc3_demuxer = { · 297 unmodified lines | ||
| 298 | 298 | .p.name = "wc3movie", |
| 299 | 299 | .p.long_name = NULL_IF_CONFIG_SMALL("Wing Commander III movie"), |
| 300 | 300 | .priv_data_size = sizeof(Wc3DemuxContext), |
| 301 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 301 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 302 | 302 | .read_probe = wc3_probe, |
| 303 | 303 | .read_header = wc3_read_header, |
| 304 | 304 | .read_packet = wc3_read_packet, |
| @@ -219,7 +219,7 @@ const FFInputFormat ff_webvtt_demuxer = { · 218 unmodified lines | ||
| 219 | 219 | .p.extensions = "vtt", |
| 220 | 220 | .p.priv_class = &webvtt_demuxer_class, |
| 221 | 221 | .priv_data_size = sizeof(WebVTTContext), |
| 222 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 222 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 223 | 223 | .read_probe = webvtt_probe, |
| 224 | 224 | .read_header = webvtt_read_header, |
| 225 | 225 | .read_packet = webvtt_read_packet, |
| @@ -581,7 +581,7 @@ const FFInputFormat ff_xmv_demuxer = { · 580 unmodified lines | ||
| 581 | 581 | .p.long_name = NULL_IF_CONFIG_SMALL("Microsoft XMV"), |
| 582 | 582 | .p.extensions = "xmv", |
| 583 | 583 | .priv_data_size = sizeof(XMVDemuxContext), |
| 584 | − .flags_internal = FF_FMT_INIT_CLEANUP, | |
| 584 | + .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, | |
| 585 | 585 | .read_probe = xmv_probe, |
| 586 | 586 | .read_header = xmv_read_header, |
| 587 | 587 | .read_packet = xmv_read_packet, |