From 7ed5e4d039ca9a6236bd2ebdfdd656c4304fbe04 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Mon, 20 May 2024 16:19:45 -0400 Subject: [PATCH] Remove FFMS_Deinit It is a no-op. Signed-off-by: Derek Buitenhuis --- doc/ffms2-api.md | 13 ------------- include/ffms.h | 1 - src/core/ffms.cpp | 4 ---- src/index/ffmsindex.cpp | 2 -- src/vapoursynth/vapoursource4.cpp | 1 - src/vapoursynth/vapoursynth4.cpp | 1 - test/display_matrix.cpp | 1 - test/hdr.cpp | 1 - test/indexer.cpp | 1 - 9 files changed, 25 deletions(-) diff --git a/doc/ffms2-api.md b/doc/ffms2-api.md index 571f849277..7dff082d11 100644 --- a/doc/ffms2-api.md +++ b/doc/ffms2-api.md @@ -129,9 +129,6 @@ int main (...) { /* now it's time to clean up */ FFMS_DestroyVideoSource(videosource); - /* uninitialize the library. */ - FFMS_Deinit(); - return 0; } ``` @@ -203,16 +200,6 @@ This argument is no longer used and is left only for API/ABI compatibility. Pass This argument is also no longer used and is left only for API/ABI compatibility. Pass 0. -### FFMS_Deinit - deinitializes the library - -[Deinit]: ##ffms_deinit---deinitializes-the-library -```c++ -void FFMS_Deinit() -``` -Deinitializes the FFMS2 library. -This function must be called once at the end of your program, and no more FFMS2 function calls must be made. -This function is threadsafe and will only be run once. - ### FFMS_GetLogLevel - gets FFmpeg message level [GetLogLevel]: #ffms_getloglevel---gets-ffmpeg-message-level diff --git a/include/ffms.h b/include/ffms.h index 586cc4ff6f..e3f150356d 100644 --- a/include/ffms.h +++ b/include/ffms.h @@ -419,7 +419,6 @@ typedef int (FFMS_CC *TIndexCallback)(int64_t Current, int64_t Total, void *ICPr /* Most functions return 0 on success */ /* Functions without error message output can be assumed to never fail in a graceful way */ FFMS_API(void) FFMS_Init(int, int); /* Pass 0 to both arguments, kept to partially preserve abi */ -FFMS_API(void) FFMS_Deinit(); FFMS_API(int) FFMS_GetVersion(); FFMS_API(int) FFMS_GetLogLevel(); FFMS_API(void) FFMS_SetLogLevel(int Level); diff --git a/src/core/ffms.cpp b/src/core/ffms.cpp index 7572af120e..8ee6974d8e 100644 --- a/src/core/ffms.cpp +++ b/src/core/ffms.cpp @@ -87,10 +87,6 @@ FFMS_API(void) FFMS_Init(int, int) { }); } -FFMS_API(void) FFMS_Deinit() { - -} - FFMS_API(int) FFMS_GetVersion() { return FFMS_VERSION; } diff --git a/src/index/ffmsindex.cpp b/src/index/ffmsindex.cpp index 9ff2fdae2e..1fa641bbcc 100644 --- a/src/index/ffmsindex.cpp +++ b/src/index/ffmsindex.cpp @@ -352,10 +352,8 @@ int main(int argc, const char *argv[]) { DoIndexing(); } catch (Error const& e) { std::cout << e.msg << std::endl << std::flush; - FFMS_Deinit(); return 1; } - FFMS_Deinit(); return 0; } diff --git a/src/vapoursynth/vapoursource4.cpp b/src/vapoursynth/vapoursource4.cpp index be437fb60b..141ad0fa6d 100644 --- a/src/vapoursynth/vapoursource4.cpp +++ b/src/vapoursynth/vapoursource4.cpp @@ -243,7 +243,6 @@ const VSFrame *VS_CC VSVideoSource4::GetFrame(int n, int activationReason, void } void VS_CC VSVideoSource4::Free(void *instanceData, VSCore *, const VSAPI *) { - FFMS_Deinit(); delete static_cast(instanceData); } diff --git a/src/vapoursynth/vapoursynth4.cpp b/src/vapoursynth/vapoursynth4.cpp index 8f8af0e554..a120690291 100644 --- a/src/vapoursynth/vapoursynth4.cpp +++ b/src/vapoursynth/vapoursynth4.cpp @@ -97,7 +97,6 @@ static void VS_CC CreateIndex(const VSMap *in, VSMap *out, void *, VSCore *, con FFMS_DestroyIndex(Index); vsapi->mapSetData(out, "result", "Valid index already exists", -1, dtUtf8, maReplace); } - FFMS_Deinit(); } static void VS_CC CreateSource(const VSMap *in, VSMap *out, void *, VSCore *core, const VSAPI *vsapi) { diff --git a/test/display_matrix.cpp b/test/display_matrix.cpp index 866fb03831..ba2f4a9a09 100644 --- a/test/display_matrix.cpp +++ b/test/display_matrix.cpp @@ -45,7 +45,6 @@ void DisplayMatrixTest::SetUp() { void DisplayMatrixTest::TearDown() { FFMS_DestroyIndex(index); FFMS_DestroyVideoSource(video_source); - FFMS_Deinit(); } bool DisplayMatrixTest::DoIndexing(std::string file_name) { diff --git a/test/hdr.cpp b/test/hdr.cpp index f3f803649e..157285ef07 100644 --- a/test/hdr.cpp +++ b/test/hdr.cpp @@ -76,7 +76,6 @@ void HDR10Test::SetUp() { void HDR10Test::TearDown() { FFMS_DestroyIndex(index); FFMS_DestroyVideoSource(video_source); - FFMS_Deinit(); } bool HDR10Test::DoIndexing(std::string file_name) { diff --git a/test/indexer.cpp b/test/indexer.cpp index b70d53f426..c996e8f080 100644 --- a/test/indexer.cpp +++ b/test/indexer.cpp @@ -71,7 +71,6 @@ void IndexerTest::SetUp() { void IndexerTest::TearDown() { FFMS_DestroyIndex(index); FFMS_DestroyVideoSource(video_source); - FFMS_Deinit(); } bool IndexerTest::DoIndexing(std::string file_name) {