dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add files

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@603 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2008-12-08 19:45:37 +00:00
parent 6f340e9462
commit 3ad915487f
21 changed files with 550 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app-cdr/k3b/files/k3b-2.0_pre20080808-ffmpeg-1.patch Normal file
View File

@@ -0,0 +1,39 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2008-08-25
Initial Package Version: 2.0 pre
Origin: me
Upstream Status: unknown
Description: correct ffmpeg location
diff -Naur k3b-2.0_pre20080808.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-2.0_pre20080808/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
--- k3b-2.0_pre20080808.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-08-25 11:51:38.000000000 +0000
+++ k3b-2.0_pre20080808/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-08-25 11:52:00.000000000 +0000
@@ -21,8 +21,8 @@
#include <kdebug.h>
extern "C" {
-#include <ffmpeg/avcodec.h>
-//#include <libavcodec/avcodec.h>
+// #include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
}
#include <math.h>
diff -Naur k3b-2.0_pre20080808.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0_pre20080808/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
--- k3b-2.0_pre20080808.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-08-25 11:51:38.000000000 +0000
+++ k3b-2.0_pre20080808/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-08-25 11:52:22.000000000 +0000
@@ -17,10 +17,10 @@
#include <config-k3b.h>
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-// #include <libavcodec/avcodec.h>
-// #include <libavformat/avformat.h>
+// #include <ffmpeg/avcodec.h>
+// #include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#include <string.h>