Rename ENABLE_FFMPEG3 to ENABLE_FFMPEG

BearWare · Nov 2, 2024 · 1b23272 · 1b23272
1 parent 619bcb1
commit 1b23272
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Library/TeamTalkLib/avstream/AudioResampler.cpp b/Library/TeamTalkLib/avstream/AudioResampler.cpp
@@ -29,7 +29,7 @@
 
 #if defined(ENABLE_DMORESAMPLER)
 #include "DMOResampler.h"
-#elif defined(ENABLE_FFMPEG3)
+#elif defined(ENABLE_FFMPEG)
 #include "FFmpegResampler.h"
 #endif
 
@@ -140,7 +140,7 @@ audio_resampler_t MakeAudioResampler(const media::AudioFormat& informat,
     resampler.reset(dmo);
     ret = dmo->Init(SAMPLEFORMAT_INT16, SAMPLEFORMAT_INT16);
     MYTRACE(ACE_TEXT("Launched DMOResampler\n"));
-#elif defined(ENABLE_FFMPEG3)
+#elif defined(ENABLE_FFMPEG)
     auto ffmpeg = new FFMPEGResampler(informat, outformat, input_samples_size);
     resampler.reset(ffmpeg);
     ret = ffmpeg->Init();

diff --git a/Library/TeamTalkLib/avstream/MediaStreamer.cpp b/Library/TeamTalkLib/avstream/MediaStreamer.cpp
@@ -31,9 +31,9 @@
 #include "WinMedia.h"
 #endif /* ENABLE_DSHOW */
 
-#if defined(ENABLE_FFMPEG3)
+#if defined(ENABLE_FFMPEG)
 #include "FFmpegStreamer.h"
-#endif /* ENABLE_FFMPEG3*/
+#endif /* ENABLE_FFMPEG*/
 
 #if defined(ENABLE_OPUSTOOLS) && defined(ENABLE_OPUS)
 #include "OpusFileStreamer.h"
@@ -56,7 +56,7 @@ bool GetMediaFileProp(const ACE_TString& filename, MediaFileProp& fileprop)
     return GetMFMediaFileProp(filename, fileprop);
 #elif defined(ENABLE_DSHOW)
     return GetDSMediaFileProp(filename, fileprop);
-#elif defined(ENABLE_FFMPEG3)
+#elif defined(ENABLE_FFMPEG)
     return GetAVMediaFileProp(filename, fileprop);
 #endif
     return false;
@@ -76,7 +76,7 @@ mediafile_streamer_t MakeMediaFileStreamer(const ACE_TString& filename, const Me
     streamer.reset(new MFStreamer(filename, out_prop));
 #elif defined(ENABLE_DSHOW)
     streamer.reset(new DSWrapperThread());
-#elif defined(ENABLE_FFMPEG3)
+#elif defined(ENABLE_FFMPEG)
     streamer.reset(new FFmpegStreamer(filename, out_prop));
 #endif
 

diff --git a/Library/TeamTalkLib/build/avstream.cmake b/Library/TeamTalkLib/build/avstream.cmake
@@ -21,7 +21,7 @@ endif()
 
 if (FEATURE_FFMPEG)
   include (ffmpeg)
-  list (APPEND AVSTREAM_COMPILE_FLAGS -DENABLE_FFMPEG3 ${FFMPEG_COMPILE_FLAGS})
+  list (APPEND AVSTREAM_COMPILE_FLAGS -DENABLE_FFMPEG ${FFMPEG_COMPILE_FLAGS})
   list (APPEND AVSTREAM_LINK_FLAGS ${FFMPEG_LINK_FLAGS})
 
   list (APPEND AVSTREAM_SOURCES ${TEAMTALKLIB_ROOT}/avstream/FFmpegStreamer.cpp)

diff --git a/Library/TeamTalkLib/test/CatchDefault.cpp b/Library/TeamTalkLib/test/CatchDefault.cpp
@@ -62,7 +62,7 @@
 #endif
 #include <codec/WaveFile.h>
 
-#if defined(ENABLE_FFMPEG3)
+#if defined(ENABLE_FFMPEG)
 #include <avstream/FFmpegStreamer.h>
 #endif
 
@@ -1751,7 +1751,7 @@ TEST_CASE("TT_AEC")
 }
 #endif
 
-#if defined(ENABLE_FFMPEG3)
+#if defined(ENABLE_FFMPEG)
 TEST_CASE("testThumbnail")
 {
     // ffmpeg -i in.mp3 -i teamtalk.png -map 0:0 -map 1:0 -c copy -id3v2_version 3 -metadata:s:v title="Album cover" -metadata:s:v comment="Cover (front)" out.mp3

diff --git a/Library/TeamTalkLib/test/catchqt/TeamTalkCatchQT/TeamTalkCatchQT.pro b/Library/TeamTalkLib/test/catchqt/TeamTalkCatchQT/TeamTalkCatchQT.pro
@@ -83,7 +83,7 @@ android: LIBS += -lOpenSLES -llog
 QMAKE_CXXFLAGS += -DENABLE_ENCRYPTION -D__ACE_INLINE__  # ace
 QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS # ffmpeg
 QMAKE_CXXFLAGS += -DENABLE_OPUS -DENABLE_OGG -DENABLE_OPUSTOOLS -DENABLE_SPEEX \
-                  -DENABLE_FFMPEG3 -DENABLE_VPX -DENABLE_WEBRTC
+                  -DENABLE_FFMPEG -DENABLE_VPX -DENABLE_WEBRTC
 
 android: DEFINES += ENABLE_OPENSLES