1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
--- k3b-1.0.5.orig/configure.in 2008-07-07 20:36:06.000000000 +0200
+++ k3b-1.0.5/configure.in 2008-07-07 20:39:13.000000000 +0200
@@ -574,12 +574,12 @@
AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_COMPILE_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
AVFormatContext* fc = 0;
AVPacket* p = 0;
@@ -589,12 +589,12 @@
[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
OLD_LIBS=$LIBS
LIBS="-lavformat -lavcodec $LIBS"
AC_LINK_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
AVFormatContext* fc = 0;
AVPacket* p = 0;
diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in 2008-07-07 20:36:06.000000000 +0200
+++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-07-07 20:43:02.000000000 +0200
@@ -19,12 +19,12 @@
AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_COMPILE_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
AVFormatContext* fc = 0;
AVPacket* p = 0;
@@ -34,12 +34,12 @@
[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
OLD_LIBS=$LIBS
LIBS="-lavformat -lavcodec $LIBS"
AC_LINK_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
AVFormatContext* fc = 0;
AVPacket* p = 0;
diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-07-07 20:36:06.000000000 +0200
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-07-07 20:45:07.000000000 +0200
@@ -20,11 +20,11 @@
#include <kdebug.h>
#include <k3bpluginfactory.h>
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
}
#include <math.h>
diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-07-07 20:36:06.000000000 +0200
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-07-07 20:44:02.000000000 +0200
@@ -16,12 +16,12 @@
#include <config.h>
#include "k3bffmpegwrapper.h"
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#include <string.h>
#include <klocale.h>
|
GitWeb