1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-19 17:11:12 +02:00

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

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

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

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