openshot/libopenshot-audio
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot-audio.git synced 2026-03-02 08:54:01 -08:00
Code Issues Packages Projects Releases Wiki Activity
54 Commits 4 Branches 19 Tags
7d225da7931e66bf1fff802d698f9c03e724dec5
Commit Graph

17 Commits

Author SHA1 Message Date
Jonathan Thomas
7d225da793 Take two at adding back libflac and libvorbis 2017-05-10 01:57:25 -05:00
Jonathan Thomas
a303479eee Merge remote-tracking branch 'origin/master' 
Conflicts:
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/all.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/alloc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/assert.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/callback.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/compat.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/endswap.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/export.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/format.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitmath.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitreader.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitwriter.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/crc.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/fixed.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/float.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/format.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/all.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitmath.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitreader.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitwriter.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/cpu.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/crc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/fixed.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/float.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/format.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/lpc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/md5.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/memory.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/stream_encoder_framing.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/window.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/all.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_decoder.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_encoder.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/md5.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/memory.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder_framing.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/window_flac.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/metadata.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/ordinals.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/stream_decoder.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/flac/stream_encoder.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/bitwise.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/codec.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/config_types.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/framing.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/analysis.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/backends.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/bitrate.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/bitrate.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/block.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/coupled/res_books_51.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/coupled/res_books_stereo.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/floor/floor_books.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/uncoupled/res_books_uncoupled.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codec_internal.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/envelope.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/envelope.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor0.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor1.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/highlevel.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/info.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup_data.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lpc.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lpc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lsp.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lsp.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mapping0.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/masking.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mdct.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mdct.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/misc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/floor_all.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_11.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_16.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_44.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_8.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_16.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44p51.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44u.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_8.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_11.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_16.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_22.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_32.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44p51.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44u.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_8.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_X.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/os.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/psy.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/psy.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/registry.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/registry.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/res0.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/scales.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/sharedbook.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/smallft.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/smallft.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/synthesis.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisenc.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.c
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/ogg.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/os_types.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/vorbisenc.h
	JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/vorbisfile.h
 2017-05-10 01:44:27 -05:00
Jonathan Thomas
9161d13969 Adding back embedded flac and vorbis, because removing them was a bad idea which causes a crash (cherry picked from commit 2448324dd1) 2017-05-10 01:43:33 -05:00
Jonathan Thomas
2448324dd1 Removing embedded flac and vorbis, because they are unused 2017-04-03 15:53:46 -05:00
Jonathan Thomas
51083bc3dd Fixed a runtime issue with WASAPI not working without first a call to CoInitialize(0). Windows-only-issue. 2015-09-23 00:42:35 -05:00
Jonathan Thomas
1d7419255f Fixed a compiler issue with JUCE_ASIO and MinGW64. 2015-09-03 17:26:13 -05:00
Jonathan Thomas
f2f4396115 Fixed compile errors on JUCE related to WASAPI and MinGW64 re-defined macros. 2015-09-03 16:10:03 -05:00
Jonathan Thomas
b5ff396bd4 Updating JUCE Audio modules to newest version (this will break a few things) 2015-09-02 18:09:37 -05:00
Jonathan Thomas
7d40d614a6 Updating JUCE Audio modules to latest version. This will break some things. 2015-09-02 18:07:25 -05:00
Jonathan Thomas
101e946d29 removed some unneeded JUCE code that was causing build errors on OS X 10.9 2014-08-08 12:57:55 -05:00
Jonathan Thomas
6b0a37044c Added condition to not build the juce_hypot function, since it colides with libopenshots Python bindings. 2014-07-21 15:12:02 -05:00
Jonathan Thomas
35c9abc955 Added -std=c++0x compile flag and disabled WASAPI support for Windows... which fixes all the new Windows build errors after upgrading JUCE to the lastest version. 2014-07-21 12:49:02 -05:00
Jonathan Thomas
3879498af3 Updated JUCE modules to version 3, which also updated the license headers to reflect AGPLv3 compatibility. 2014-07-10 14:24:30 -05:00
Jonathan Thomas
643b0e4d3b Tweaked the JUCE MEMORY header to conditionaly define alloca (which is already defined in some versions of MinGW) 2014-02-19 15:44:48 -06:00
Jonathan Thomas
0a31cf24cd Fixed build issues on Windwos 7, by disabling WASAPI and adding a sleep() macro and linking a few new Windows libraries. 2012-06-22 01:29:22 -05:00
Jonathan Thomas
9fefbcbc10 Fixing JUCE build errors on MinGW 2012-06-18 17:51:22 -05:00
Jonathan Thomas
c0e605fafe initial files in the openshot audio library 2012-06-15 17:45:27 -05:00