Hi,
Recent ffmpeg has changed include file locations (cleaned up
IMHO). With the appended patch it is possible to compile
with the new layout and with the old one in ffmpeg.src
(a bit of a hack with a manual Depends(), maybe someone can
come up with a cleaner solution).
Regards,
Wolfram
diff -ur dvbcut/SConstruct dvbcut-wg/SConstruct
--- dvbcut/SConstruct Sun Mar 23 14:51:04 2008
+++ dvbcut-wg/SConstruct Sun Mar 23 20:56:26 2008
@@ -32,7 +32,7 @@
### FFMPEG
opts.Add('FFMPEG',"""Prefix path to the FFMPEG libraries.
- If set to '/usr', include files have to be in '/usr/include/ffmpeg'
+ If set to '/usr', include files have to be in '/usr/include'
and static libraries in '/usr/lib'. If unset, FFMPEG will be
compiled locally.""",None)
@@ -117,6 +117,9 @@
if (env.GetOption('clean') or not ((env.has_key("FFMPEG")) and
(env["FFMPEG"]!=None))):
localffmpeg=True
ffmpegpath=Dir("ffmpeg").abspath
+ env.Append(CPPPATH=Dir("ffmpeg.src").abspath)
+ env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include/ffmpeg'))
+ Depends('ffmpeg.src/libavcodec/avcodec.h', 'ffmpeg/include/ffmpeg/avcodec.h')
else:
localffmpeg=False
ffmpegpath=env["FFMPEG"].rstrip("/")
diff -ur dvbcut/src/avframe.h dvbcut-wg/src/avframe.h
--- dvbcut/src/avframe.h Fri Sep 7 16:35:06 2007
+++ dvbcut-wg/src/avframe.h Sun Mar 23 17:51:22 2008
@@ -22,9 +22,9 @@
#define _DVBCUT_AVFRAME_H
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#ifdef HAVE_LIB_SWSCALE
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
#endif
}
diff -ur dvbcut/src/lavfmuxer.cpp dvbcut-wg/src/lavfmuxer.cpp
--- dvbcut/src/lavfmuxer.cpp Sun Mar 23 14:51:04 2008
+++ dvbcut-wg/src/lavfmuxer.cpp Sun Mar 23 15:11:50 2008
@@ -19,8 +19,8 @@
/* $Id: lavfmuxer.cpp 105 2007-11-28 14:31:47Z too-tired $ */
extern "C" {
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
}
#include <cstring>
#include <utility>
diff -ur dvbcut/src/lavfmuxer.h dvbcut-wg/src/lavfmuxer.h
--- dvbcut/src/lavfmuxer.h Sat Jul 28 20:06:03 2007
+++ dvbcut-wg/src/lavfmuxer.h Sun Mar 23 15:09:43 2008
@@ -22,7 +22,7 @@
#define _DVBCUT_LAVFMUXER_H
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
}
#include "mpgfile.h"
diff -ur dvbcut/src/main.cpp dvbcut-wg/src/main.cpp
--- dvbcut/src/main.cpp Sun Mar 23 14:51:04 2008
+++ dvbcut-wg/src/main.cpp Sun Mar 23 15:13:23 2008
@@ -32,7 +32,7 @@
#include <qapplication.h>
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
}
#include <qimage.h>
#include <qsettings.h>
diff -ur dvbcut/src/stream.h dvbcut-wg/src/stream.h
--- dvbcut/src/stream.h Sat Jul 28 20:06:03 2007
+++ dvbcut-wg/src/stream.h Sun Mar 23 15:09:14 2008
@@ -24,7 +24,7 @@
#include <string>
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
}
class stream
diff -ur dvbcut/src/streamdata.h dvbcut-wg/src/streamdata.h
--- dvbcut/src/streamdata.h Sun Nov 11 13:06:06 2007
+++ dvbcut-wg/src/streamdata.h Sun Mar 23 15:10:49 2008
@@ -24,7 +24,7 @@
#include <string>
#include <list>
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
}
#include "port.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
DVBCUT-user mailing list
DVBCUT-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dvbcut-user
