Moin!
Funktioniert der angehängte Patch mit dem neuen ffmpeg?
--
Michael "Tired" Riepe <[EMAIL PROTECTED]>
X-Tired: Each morning I get up I die a little
Index: src/lavfmuxer.h
===================================================================
--- src/lavfmuxer.h (revision 122)
+++ src/lavfmuxer.h (working copy)
@@ -22,7 +22,7 @@
#define _DVBCUT_LAVFMUXER_H
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
}
#include "mpgfile.h"
Index: src/main.cpp
===================================================================
--- src/main.cpp (revision 122)
+++ src/main.cpp (working copy)
@@ -32,7 +32,7 @@
#include <qapplication.h>
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
}
#include <qimage.h>
#include <qsettings.h>
Index: src/avframe.h
===================================================================
--- src/avframe.h (revision 122)
+++ src/avframe.h (working copy)
@@ -22,9 +22,9 @@
#define _DVBCUT_AVFRAME_H
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <avcodec.h>
#ifdef HAVE_LIB_SWSCALE
-#include <ffmpeg/swscale.h>
+#include <swscale.h>
#endif
}
Index: src/stream.h
===================================================================
--- src/stream.h (revision 122)
+++ src/stream.h (working copy)
@@ -24,7 +24,7 @@
#include <string>
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <avcodec.h>
}
class stream
Index: src/lavfmuxer.cpp
===================================================================
--- src/lavfmuxer.cpp (revision 122)
+++ src/lavfmuxer.cpp (working copy)
@@ -19,8 +19,8 @@
/* $Id$ */
extern "C" {
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <avformat.h>
+#include <avcodec.h>
}
#include <cstring>
#include <utility>
Index: src/streamdata.h
===================================================================
--- src/streamdata.h (revision 122)
+++ src/streamdata.h (working copy)
@@ -24,7 +24,7 @@
#include <string>
#include <list>
extern "C" {
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
}
#include "port.h"
Index: SConstruct
===================================================================
--- SConstruct (revision 122)
+++ SConstruct (working copy)
@@ -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)
@@ -119,10 +119,16 @@
ffmpegpath=Dir("ffmpeg").abspath
else:
localffmpeg=False
- ffmpegpath=env["FFMPEG"].rstrip("/")
+ ffmpegpath=env["FFMPEG"].rstrip(os.sep)
+if (localffmpeg or
os.path.isdir(os.path.join(str(ffmpegpath),'include','ffmpeg'))):
+ env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include','ffmpeg'))
+else:
+ env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include','libavcodec'))
+ env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include','libavformat'))
+ env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include','libswscale'))
+
if (ffmpegpath!='/usr'):
- env.Append(CPPPATH=os.path.join(str(ffmpegpath),'include'))
env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
env.Append(LIBS=['avformat','avcodec','avutil'])
@@ -133,7 +139,7 @@
conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
conf.env.ParseConfig('pkg-config --cflags --libs libswscale')
print "Checking for C library swscale... yes"
- elif (conf.CheckLibWithHeader('swscale', 'ffmpeg/swscale.h', 'C')):
+ elif (conf.CheckLibWithHeader('swscale', 'swscale.h', 'C')):
conf.env.Append(CPPDEFINES="HAVE_LIB_SWSCALE")
### FINISH
-------------------------------------------------------------------------
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
