From ec0ef9c1d1dd6521dce5f3c02ce291cdf89aa98c Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 7 Sep 2013 12:51:05 -0700 Subject: [PATCH] Remove FFMS_SetOutputFormatV It's been deprecated for two years and the soname is changing anyway so it's a good time to finally remove it. --- include/ffms.h | 3 +-- src/core/ffms.cpp | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/ffms.h b/include/ffms.h index 8f338f8f11..9756c3d829 100644 --- a/include/ffms.h +++ b/include/ffms.h @@ -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 @@ -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) */ diff --git a/src/core/ffms.cpp b/src/core/ffms.cpp index 4985ea5e68..fbeb4275fa 100644 --- a/src/core/ffms.cpp +++ b/src/core/ffms.cpp @@ -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 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 {