Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18445/src
Modified Files:
FFmpeg.h
Log Message:
A few changes (rearranged #ifdefs here, changed include path there...).
Also, ImportStreamDialog is now treated as separate (from FFmpeg) feature.
Index: FFmpeg.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FFmpeg.h 3 Jun 2008 21:51:50 -0000 1.3
+++ FFmpeg.h 4 Jun 2008 09:55:44 -0000 1.4
@@ -15,9 +15,8 @@
#if !defined(__AUDACITY_FFMPEG__)
#define __AUDACITY_FFMPEG__
-
-#include "../Audacity.h" // pulls in config*.h and other program stuff
-#include <Experimental.h>
+#include "Audacity.h" // pulls in config*.h and other program stuff
+#include "Experimental.h"
#if defined(USE_FFMPEG)
#include <wx/dynlib.h>
#include <wx/log.h> // for wxLogNull
@@ -26,8 +25,8 @@
#define __STDC_CONSTANT_MACROS
extern "C" {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#define INITDYN(w,f) if ((*(void**)&this->f=(void*)w.GetSymbol(wxT(#f))) ==
NULL) return false
@@ -114,5 +113,6 @@
bool mLibsLoaded;
};
-#endif //FFMPEG_INTEGRATION
+#endif //USE_FFMPEG
#endif
+
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
