Skip to content
Permalink
Browse files

Remove remaining references to FFmpeg

  • Loading branch information...
chirlu committed Mar 5, 2013
1 parent e60dbd6 commit e597e802903cc5f7c72e2efef1cbb166ea79b194
Showing with 10 additions and 133 deletions.
  1. +0 −2 FEATURES.in
  2. +0 −65 m4/ffmpeg.m4
  3. +2 −4 msvc10/LibSoX.vcxproj
  4. +0 −6 msvc10/LibSoX.vcxproj.filters
  5. +4 −4 msvc10/Readme.txt
  6. +0 −16 msvc10/SoX.vcxproj
  7. +0 −5 msvc10/SoX/soxconfig.h
  8. +2 −10 msvc9/LibSoX.vcproj
  9. +2 −2 msvc9/Readme.txt
  10. +0 −14 msvc9/SoX.vcproj
  11. +0 −5 msvc9/Sox/soxconfig.h
@@ -21,8 +21,6 @@ The current release handles the following audio file formats:
* 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)

This file was deleted.

@@ -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" />
@@ -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>
@@ -381,9 +378,6 @@
<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">
<Filter>Format Sources</Filter>
</ClCompile>
@@ -2,10 +2,10 @@ This directory includes hand-crafted project files for building SoX using the
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:

@@ -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 @@ xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)"
<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 @@ xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)"
<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" />
@@ -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
@@ -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"
@@ -213,10 +213,6 @@
RelativePath="..\src\effects.h"
>
</File>
<File
RelativePath="..\src\ffmpeg.h"
>
</File>
<File
RelativePath="..\src\fft4g.h"
>
@@ -909,10 +905,6 @@
RelativePath="..\src\fap.c"
>
</File>
<File
RelativePath="..\src\ffmpeg.c"
>
</File>
<File
RelativePath="..\src\flac.c"
>
@@ -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.

@@ -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 &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;xcopy /d /y ..\..\ffmpeg\avcodec-52.dll &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;xcopy /d /y ..\..\ffmpeg\avutil-49.dll &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;"
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"
@@ -187,12 +179,6 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copying FFmpeg DLLs..."
CommandLine="xcopy /d /y ..\..\ffmpeg\avformat-52.dll &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;xcopy /d /y ..\..\ffmpeg\avcodec-52.dll &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;xcopy /d /y ..\..\ffmpeg\avutil-49.dll &quot;$(SolutionDir)$(ConfigurationName)&quot;&#x0D;&#x0A;"
ExcludedFromBuild="true"
/>
</Configuration>
</Configurations>
<References>
@@ -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

0 comments on commit e597e80

Please sign in to comment.
You can’t perform that action at this time.