Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-03 23:53:55 +01:00
Code Issues Releases Wiki Activity

Bug 539 (P2) - Audacity does not build if configured --without-ffmpeg

Browse Source 
more pinpointed fix that should close this
This commit is contained in:
v.audacity
2012-07-25 02:00:48 +00:00
parent 10d9c9cd9b
commit d90e6c5285
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Experimental.h
View File

@@ -84,9 +84,7 @@
// 2.0 release
//#define EXPERIMENTAL_OD_FLAC
// similarly for FFmpeg:
#ifndef __WXGTK__ // Won't build on Fedora 17, per http://bugzilla.audacityteam.org/show_bug.cgi?id=539.
#define EXPERIMENTAL_OD_FFMPEG 1
#endif
#define EXPERIMENTAL_OD_FFMPEG 1
// Philip Van Baren 01 July 2009
// Replace RealFFT() and PowerSpectrum function to use (faster) RealFFTf function

23
src/ondemand/ODDecodeFFmpegTask.cpp
View File

@@ -1,11 +1,16 @@
/*
* ODDecodeFFmpegTask.cpp
* Audacity
*
* Created by apple on 3/8/10.
* Copyright 2010 __MyCompanyName__. All rights reserved.
*
*/
/**********************************************************************
Audacity: A Digital Audio Editor
Audacity(R) is copyright (c) 1999-2012 Audacity Team.
License: GPL v2. See License.txt.
ODDecodeFFmpegTask.cpp
Michael Chinen
******************************************************************/
#ifdef USE_FFMPEG
#include <wx/wxprec.h>
#include "../Experimental.h"
// For compilers that support precompilation, includes "wx/wx.h".
@@ -655,4 +660,4 @@ void ODFFmpegDecoder::InsertCache(FFMpegDecodeCache* cache) {
}
#endif
#endif // USE_FFMPEG

31
src/ondemand/ODDecodeFFmpegTask.h
View File

@@ -1,14 +1,19 @@
/*
* ODDecodeFFmpegTask.h
* Audacity
*
* Created by apple on 3/8/10.
* Copyright 2010 __MyCompanyName__. All rights reserved.
*
*/
#include "../Experimental.h"
#ifdef EXPERIMENTAL_OD_FFMPEG
/**********************************************************************
Audacity: A Digital Audio Editor
Audacity(R) is copyright (c) 1999-2012 Audacity Team.
License: GPL v2. See License.txt.
ODDecodeFFmpegTask.h
Michael Chinen
******************************************************************/
#ifdef USE_FFMPEG
#include "../Experimental.h"
#ifdef EXPERIMENTAL_OD_FFMPEG
#ifndef __ODDECODEFFMPEGTASK__
#define __ODDECODEFFMPEGTASK__
@@ -45,4 +50,6 @@ class ODDecodeFFmpegTask:public ODDecodeTask
};
#endif //__ODDECODEFFMPEGTASK__
#endif //EXPERIMENTAL_OD_FFMPEG
#endif //EXPERIMENTAL_OD_FFMPEG
#endif // USE_FFMPEG