Skip to content

Commit

Permalink
Remove FFMS_SetOutputFormatV
Browse files Browse the repository at this point in the history
It's been deprecated for two years and the soname is changing anyway so
it's a good time to finally remove it.
  • Loading branch information
tgoyne committed Sep 7, 2013
1 parent 429ee41 commit ec0ef9c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
3 changes: 1 addition & 2 deletions include/ffms.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#define FFMS_H

// Version format: major - minor - micro - bump
#define FFMS_VERSION ((2 << 24) | (17 << 16) | (4 << 8) | 0)
#define FFMS_VERSION ((2 << 24) | (18 << 16) | (0 << 8) | 0)

#include <stdint.h>

Expand Down Expand Up @@ -362,7 +362,6 @@ FFMS_API(const FFMS_AudioProperties *) FFMS_GetAudioProperties(FFMS_AudioSource
FFMS_API(const FFMS_Frame *) FFMS_GetFrame(FFMS_VideoSource *V, int n, FFMS_ErrorInfo *ErrorInfo);
FFMS_API(const FFMS_Frame *) FFMS_GetFrameByTime(FFMS_VideoSource *V, double Time, FFMS_ErrorInfo *ErrorInfo);
FFMS_API(int) FFMS_GetAudio(FFMS_AudioSource *A, void *Buf, int64_t Start, int64_t Count, FFMS_ErrorInfo *ErrorInfo);
FFMS_DEPRECATED_API(int) FFMS_SetOutputFormatV(FFMS_VideoSource *V, int64_t TargetFormats, int Width, int Height, int Resizer, FFMS_ErrorInfo *ErrorInfo);
FFMS_API(int) FFMS_SetOutputFormatV2(FFMS_VideoSource *V, const int *TargetFormats, int Width, int Height, int Resizer, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (15 << 16) | (3 << 8) | 0) */
FFMS_API(void) FFMS_ResetOutputFormatV(FFMS_VideoSource *V);
FFMS_API(int) FFMS_SetInputFormatV(FFMS_VideoSource *V, int ColorSpace, int ColorRange, int Format, FFMS_ErrorInfo *ErrorInfo); /* Introduced in FFMS_VERSION ((2 << 24) | (17 << 16) | (1 << 8) | 0) */
Expand Down
9 changes: 0 additions & 9 deletions src/core/ffms.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,6 @@ FFMS_API(int) FFMS_GetAudio(FFMS_AudioSource *A, void *Buf, int64_t Start, int64
return FFMS_ERROR_SUCCESS;
}

FFMS_API(int) FFMS_SetOutputFormatV(FFMS_VideoSource *V, int64_t TargetFormats, int Width, int Height, int Resizer, FFMS_ErrorInfo *ErrorInfo) {
std::vector<int> L;
for (int i = 0; i < 64; i++)
if ((TargetFormats >> i) & 1)
L.push_back(i);
L.push_back(PIX_FMT_NONE);
return FFMS_SetOutputFormatV2(V, &L[0], Width, Height, Resizer, ErrorInfo);
}

FFMS_API(int) FFMS_SetOutputFormatV2(FFMS_VideoSource *V, const int *TargetFormats, int Width, int Height, int Resizer, FFMS_ErrorInfo *ErrorInfo) {
ClearErrorInfo(ErrorInfo);
try {
Expand Down

0 comments on commit ec0ef9c

Please sign in to comment.