Skip to content

Commit 7ed5e4d

Browse files
committed
Remove FFMS_Deinit
It is a no-op. Signed-off-by: Derek Buitenhuis <[email protected]>
1 parent b0bae80 commit 7ed5e4d

File tree

9 files changed

+0
-25
lines changed

9 files changed

+0
-25
lines changed

doc/ffms2-api.md

-13
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ int main (...) {
129129
/* now it's time to clean up */
130130
FFMS_DestroyVideoSource(videosource);
131131

132-
/* uninitialize the library. */
133-
FFMS_Deinit();
134-
135132
return 0;
136133
}
137134
```
@@ -203,16 +200,6 @@ This argument is no longer used and is left only for API/ABI compatibility. Pass
203200
204201
This argument is also no longer used and is left only for API/ABI compatibility. Pass 0.
205202
206-
### FFMS_Deinit - deinitializes the library
207-
208-
[Deinit]: ##ffms_deinit---deinitializes-the-library
209-
```c++
210-
void FFMS_Deinit()
211-
```
212-
Deinitializes the FFMS2 library.
213-
This function must be called once at the end of your program, and no more FFMS2 function calls must be made.
214-
This function is threadsafe and will only be run once.
215-
216203
### FFMS_GetLogLevel - gets FFmpeg message level
217204
218205
[GetLogLevel]: #ffms_getloglevel---gets-ffmpeg-message-level

include/ffms.h

-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ typedef int (FFMS_CC *TIndexCallback)(int64_t Current, int64_t Total, void *ICPr
419419
/* Most functions return 0 on success */
420420
/* Functions without error message output can be assumed to never fail in a graceful way */
421421
FFMS_API(void) FFMS_Init(int, int); /* Pass 0 to both arguments, kept to partially preserve abi */
422-
FFMS_API(void) FFMS_Deinit();
423422
FFMS_API(int) FFMS_GetVersion();
424423
FFMS_API(int) FFMS_GetLogLevel();
425424
FFMS_API(void) FFMS_SetLogLevel(int Level);

src/core/ffms.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ FFMS_API(void) FFMS_Init(int, int) {
8787
});
8888
}
8989

90-
FFMS_API(void) FFMS_Deinit() {
91-
92-
}
93-
9490
FFMS_API(int) FFMS_GetVersion() {
9591
return FFMS_VERSION;
9692
}

src/index/ffmsindex.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,8 @@ int main(int argc, const char *argv[]) {
352352
DoIndexing();
353353
} catch (Error const& e) {
354354
std::cout << e.msg << std::endl << std::flush;
355-
FFMS_Deinit();
356355
return 1;
357356
}
358357

359-
FFMS_Deinit();
360358
return 0;
361359
}

src/vapoursynth/vapoursource4.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ const VSFrame *VS_CC VSVideoSource4::GetFrame(int n, int activationReason, void
243243
}
244244

245245
void VS_CC VSVideoSource4::Free(void *instanceData, VSCore *, const VSAPI *) {
246-
FFMS_Deinit();
247246
delete static_cast<VSVideoSource4 *>(instanceData);
248247
}
249248

src/vapoursynth/vapoursynth4.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ static void VS_CC CreateIndex(const VSMap *in, VSMap *out, void *, VSCore *, con
9797
FFMS_DestroyIndex(Index);
9898
vsapi->mapSetData(out, "result", "Valid index already exists", -1, dtUtf8, maReplace);
9999
}
100-
FFMS_Deinit();
101100
}
102101

103102
static void VS_CC CreateSource(const VSMap *in, VSMap *out, void *, VSCore *core, const VSAPI *vsapi) {

test/display_matrix.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ void DisplayMatrixTest::SetUp() {
4545
void DisplayMatrixTest::TearDown() {
4646
FFMS_DestroyIndex(index);
4747
FFMS_DestroyVideoSource(video_source);
48-
FFMS_Deinit();
4948
}
5049

5150
bool DisplayMatrixTest::DoIndexing(std::string file_name) {

test/hdr.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void HDR10Test::SetUp() {
7676
void HDR10Test::TearDown() {
7777
FFMS_DestroyIndex(index);
7878
FFMS_DestroyVideoSource(video_source);
79-
FFMS_Deinit();
8079
}
8180

8281
bool HDR10Test::DoIndexing(std::string file_name) {

test/indexer.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void IndexerTest::SetUp() {
7171
void IndexerTest::TearDown() {
7272
FFMS_DestroyIndex(index);
7373
FFMS_DestroyVideoSource(video_source);
74-
FFMS_Deinit();
7574
}
7675

7776
bool IndexerTest::DoIndexing(std::string file_name) {

0 commit comments

Comments
 (0)