ref: e597e802903cc5f7c72e2efef1cbb166ea79b194
parent: e60dbd620fdf1ca426d1ff12b212aef45be4d3c2
author: Ulrich Klauer <ulrich@chirlu.de>
date: Tue Mar 5 18:36:24 EST 2013
Remove remaining references to FFmpeg
--- a/FEATURES.in
+++ b/FEATURES.in
@@ -21,8 +21,6 @@
* Amiga MAUD files
* AMR-WB & AMR-NB (with optional libamrwb & libamrnb libraries)
* MP2/MP3 (with optional libmad, libtwolame and libmp3lame libraries)
-* MP4, AAC, AC3, WAVPACK, AMR-NB files (with optional ffmpeg library)
-* AVI, WMV, Ogg Theora, MPEG video files (with optional ffmpeg library)
(:cell:)
* Ogg Vorbis files (with optional Ogg Vorbis libraries)
* FLAC files (with optional libFLAC)
--- a/m4/ffmpeg.m4
+++ /dev/null
@@ -1,65 +1,0 @@
-dnl SOX_PATH_FFMPEG
-dnl cbagwell@users.sourceforge.net 1-3-2007
-dnl
-# SOX_PATH_FFMPEG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-# Test for libavformat, and define FFMPEG_CFLAGS and FFMPEG_LIBS
-AC_DEFUN([SOX_PATH_FFMPEG],
-[dnl
-# Step 1: Use PKG_CHECK_MODULES if available
-m4_ifdef([PKG_CHECK_MODULES],
- [# PKG_CHECK_MODULES available
- PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],
- have_ffmpeg="maybe",
- have_ffmpeg="no")],
- [# Step 2: Use pkg-config manually if available
- AC_PATH_PROG([PKGCONFIG], [pkg-config], [none])
- if test "$PKGCONFIG" != "none" && `$PKGCONFIG --exists libavformat libavcodec libavutil`
- then
- FFMPEG_CFLAGS=`$PKGCONFIG --cflags libavformat`
- FFMPEG_LIBS=`$PKGCONFIG --libs libavformat libavcodec libavutil`
- have_ffmpeg="maybe"
- else
- have_ffmpeg="no"
- fi])
-
-# Step 3: Even if pkg-config says its not installed, user may have
-# manually installed libraries with no pkg-config support
-if test "$have_ffmpeg" = "no"
-then
- # Some packages distribute a <package>-config which we could check
- # for but libavformat doesn't have that. We could use AC_PATH_PROG()
- # similar to above for finding pkg-config.
-
- # As a last resort, just hope that header and library can
- # be found in default paths and that it doesn't need
- # to link against any other libraries.
- FFMPEG_LIBS="-lavformat -lavcodec -lavutil"
- have_ffmpeg="maybe"
-fi
-
-# Even if pkg-config or similar told us how to find the library,
-# do a safety check.
-if test "$have_ffmpeg" != "no"
-then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $FFMPEG_CFLAGS"
- CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
- LIBS="$LIBS $FFMPEG_LIBS"
- have_ffmpeg="no"
- AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h],
- [AC_CHECK_LIB(avformat, av_open_input_file,
- [AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h],
- [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes)])])
- break])
- CFLAGS="$ac_save_CFLAGS"
- CPPFAGS="$ac_save_CPPFLAGS"
- LIBS="$ac_save_LIBS"
-fi
-
-if test "$have_ffmpeg" != "yes"
-then
- ifelse([$2], , :, [$2])
-fi
-])dnl SOX_PATH_FFMPEG
--- a/msvc10/LibSoX.vcxproj
+++ b/msvc10/LibSoX.vcxproj
@@ -51,7 +51,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
@@ -75,7 +75,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -106,7 +106,6 @@
<ClInclude Include="..\src\dft_filter.h" />
<ClInclude Include="..\src\dither.h" />
<ClInclude Include="..\src\effects.h" />
- <ClInclude Include="..\src\ffmpeg.h" />
<ClInclude Include="..\src\fft4g.h" />
<ClInclude Include="..\src\fifo.h" />
<ClInclude Include="..\src\formats.h" />
@@ -263,7 +262,6 @@
<ClCompile Include="..\src\f4-fmt.c" />
<ClCompile Include="..\src\f8-fmt.c" />
<ClCompile Include="..\src\fap.c" />
- <ClCompile Include="..\src\ffmpeg.c" />
<ClCompile Include="..\src\flac.c" />
<ClCompile Include="..\src\gsm.c" />
<ClCompile Include="..\src\gsrt.c" />
--- a/msvc10/LibSoX.vcxproj.filters
+++ b/msvc10/LibSoX.vcxproj.filters
@@ -58,9 +58,6 @@
<ClInclude Include="..\src\effects.h">
<Filter>Headers</Filter>
</ClInclude>
- <ClInclude Include="..\src\ffmpeg.h">
- <Filter>Headers</Filter>
- </ClInclude>
<ClInclude Include="..\src\fft4g.h">
<Filter>Headers</Filter>
</ClInclude>
@@ -379,9 +376,6 @@
<Filter>Format Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\fap.c">
- <Filter>Format Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\ffmpeg.c">
<Filter>Format Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\flac.c">
--- a/msvc10/Readme.txt
+++ b/msvc10/Readme.txt
@@ -2,10 +2,10 @@
Microsoft Visual C++ 10.0 (or later) compilers, available through Visual Studio
2010, Visual Studio 2012, or by downloading the freely-available Microsoft
Windows SDK 7.1. This is the easiest way to build SoX with MS Visual C++.
-The resulting sox.exe has support for all SoX features except magic, ffmpeg,
-ladspa, and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll
-or cygmad-0.dll), libsndfile (libsndfile-1.dll), and AMR support
-(libamrnb-3.dll, libamrwb-3.dll) are loaded at runtime if they are available.
+The resulting sox.exe has support for all SoX features except magic, ladspa,
+and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or
+cygmad-0.dll), libsndfile (libsndfile-1.dll), and AMR support (libamrnb-3.dll,
+libamrwb-3.dll) are loaded at runtime if they are available.
How to build:
--- a/msvc10/SoX.vcxproj
+++ b/msvc10/SoX.vcxproj
@@ -76,7 +76,6 @@
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../ffmpeg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -85,13 +84,6 @@
<SetChecksum>true</SetChecksum>
<TargetMachine>MachineX86</TargetMachine>
</Link>
- <PostBuildEvent>
- <Message>Copying FFmpeg DLLs...</Message>
- <Command>xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(Configuration)"
-xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(Configuration)"
-xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)"
-</Command>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -117,7 +109,6 @@
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
- <AdditionalLibraryDirectories>../../ffmpeg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -126,13 +117,6 @@
<SetChecksum>true</SetChecksum>
<TargetMachine>MachineX86</TargetMachine>
</Link>
- <PostBuildEvent>
- <Message>Copying FFmpeg DLLs...</Message>
- <Command>xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(Configuration)"
-xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(Configuration)"
-xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)"
-</Command>
- </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\sox.c" />
--- a/msvc10/SoX/soxconfig.h
+++ b/msvc10/SoX/soxconfig.h
@@ -50,11 +50,6 @@
#define STATIC_AMRWB 1
#define DL_AMRWB 1
-// SoX FFMPEG support is currently unreliable, and especially so under MSVC.
-//#define HAVE_FFMPEG 1
-#define STATIC_FFMPEG 1
-#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
-
#define HAVE_FLAC 1
#define STATIC_FLAC 1
#define FLAC__NO_DLL
--- a/msvc9/LibSoX.vcproj
+++ b/msvc9/LibSoX.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
+ AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
MinimalRebuild="true"
@@ -113,7 +113,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
+ AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
ExceptionHandling="0"
@@ -214,10 +214,6 @@
>
</File>
<File
- RelativePath="..\src\ffmpeg.h"
- >
- </File>
- <File
RelativePath="..\src\fft4g.h"
>
</File>
@@ -907,10 +903,6 @@
</File>
<File
RelativePath="..\src\fap.c"
- >
- </File>
- <File
- RelativePath="..\src\ffmpeg.c"
>
</File>
<File
--- a/msvc9/Readme.txt
+++ b/msvc9/Readme.txt
@@ -1,8 +1,8 @@
This directory includes hand-crafted project files for building SoX under
MSVC9. The project files may be replaced by expanding CMAKE support in the
future, but for now, this is the easiest way to build SoX with MS Visual C++.
-The resulting sox.exe has support for all SoX features except magic, ffmpeg,
-and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or
+The resulting sox.exe has support for all SoX features except magic, and
+pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or
cygmad-0.dll), libsndfile (libsndfile-1.dll) and AMR support (libamrnb-3.dll,
libamrwb-3.dll) are loaded at runtime if they are available.
--- a/msvc9/SoX.vcproj
+++ b/msvc9/SoX.vcproj
@@ -71,7 +71,6 @@
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe"
- AdditionalLibraryDirectories="../../ffmpeg"
DelayLoadDLLs="winmm.dll"
GenerateDebugInformation="true"
SubSystem="1"
@@ -97,12 +96,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying FFmpeg DLLs..."
- CommandLine="xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(ConfigurationName)"
"
- ExcludedFromBuild="true"
- />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -160,7 +153,6 @@
AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="../../ffmpeg"
DelayLoadDLLs="winmm.dll"
GenerateDebugInformation="true"
SubSystem="1"
@@ -186,12 +178,6 @@
/>
<Tool
Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying FFmpeg DLLs..."
- CommandLine="xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(ConfigurationName)"
"
- ExcludedFromBuild="true"
/>
</Configuration>
</Configurations>
--- a/msvc9/Sox/soxconfig.h
+++ b/msvc9/Sox/soxconfig.h
@@ -32,11 +32,6 @@
#define STATIC_AMRWB 1
#define DL_AMRWB 1
-// SoX FFMPEG support is currently unreliable, and especially so under MSVC.
-//#define HAVE_FFMPEG 1
-#define STATIC_FFMPEG 1
-#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
-
#define HAVE_FLAC 1
#define STATIC_FLAC 1
#define FLAC__NO_DLL