mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-21 14:50:06 +02:00
Bug 539 (P2) - Audacity does not build if configured --without-ffmpeg
Revert to quick fix of r 11867. Steve reports Debian build error with r11868. Left that code in, because this should override it.
This commit is contained in:
parent
98b6cb55d0
commit
24af4febea
src/ondemand
@ -9,8 +9,6 @@
|
|||||||
|
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
|
|
||||||
#ifdef USE_FFMPEG
|
|
||||||
|
|
||||||
#include <wx/wxprec.h>
|
#include <wx/wxprec.h>
|
||||||
#include "../Experimental.h"
|
#include "../Experimental.h"
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@ -660,4 +658,4 @@ void ODFFmpegDecoder::InsertCache(FFMpegDecodeCache* cache) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // USE_FFMPEG
|
|
||||||
|
@ -9,8 +9,6 @@
|
|||||||
|
|
||||||
******************************************************************/
|
******************************************************************/
|
||||||
|
|
||||||
#ifdef USE_FFMPEG
|
|
||||||
|
|
||||||
#include "../Experimental.h"
|
#include "../Experimental.h"
|
||||||
|
|
||||||
#ifdef EXPERIMENTAL_OD_FFMPEG
|
#ifdef EXPERIMENTAL_OD_FFMPEG
|
||||||
@ -51,5 +49,3 @@ class ODDecodeFFmpegTask:public ODDecodeTask
|
|||||||
#endif //__ODDECODEFFMPEGTASK__
|
#endif //__ODDECODEFFMPEGTASK__
|
||||||
|
|
||||||
#endif //EXPERIMENTAL_OD_FFMPEG
|
#endif //EXPERIMENTAL_OD_FFMPEG
|
||||||
|
|
||||||
#endif // USE_FFMPEG
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user