Skip to content

Commit

Permalink
Remove FFMS_Deinit
Browse files Browse the repository at this point in the history
It is a no-op.

Signed-off-by: Derek Buitenhuis <[email protected]>
  • Loading branch information
dwbuiten committed May 28, 2024
1 parent b0bae80 commit 7ed5e4d
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 25 deletions.
13 changes: 0 additions & 13 deletions doc/ffms2-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ int main (...) {
/* now it's time to clean up */
FFMS_DestroyVideoSource(videosource);

/* uninitialize the library. */
FFMS_Deinit();

return 0;
}
```
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/ffms.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions src/core/ffms.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ FFMS_API(void) FFMS_Init(int, int) {
});
}

FFMS_API(void) FFMS_Deinit() {

}

FFMS_API(int) FFMS_GetVersion() {
return FFMS_VERSION;
}
Expand Down
2 changes: 0 additions & 2 deletions src/index/ffmsindex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion src/vapoursynth/vapoursource4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<VSVideoSource4 *>(instanceData);
}

Expand Down
1 change: 0 additions & 1 deletion src/vapoursynth/vapoursynth4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion test/display_matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion test/hdr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion test/indexer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 7ed5e4d

Please sign in to comment.