1
Index: mediatomb-0.11.0/configure
2
===================================================================
3
--- mediatomb-0.11.0.orig/configure 2009-01-08 10:55:30.000000000 +0100
4
+++ mediatomb-0.11.0/configure 2009-01-08 10:55:53.000000000 +0100
5
@@ -26123,9 +26123,9 @@
6
if test "x$FFMPEG_OK" = xyes; then
7
if test -n "$FFMPEG_SEARCH_HEADERS" ; then
8
CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
9
- as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
10
-{ echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" >&5
11
-echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
12
+ as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
13
+{ echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" >&5
14
+echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
15
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
16
echo $ECHO_N "(cached) $ECHO_C" >&6
18
@@ -26141,7 +26141,7 @@
22
-#include <$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h>
23
+#include <$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h>
25
rm -f conftest.$ac_objext
26
if { (ac_try="$ac_compile"
27
@@ -26187,8 +26187,8 @@
31
- { echo "$as_me:$LINENO: checking for ffmpeg/avformat.h" >&5
32
-echo $ECHO_N "checking for ffmpeg/avformat.h... $ECHO_C" >&6; }
33
+ { echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
34
+echo $ECHO_N "checking for libavformat/avformat.h... $ECHO_C" >&6; }
35
if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
36
echo $ECHO_N "(cached) $ECHO_C" >&6
38
@@ -26204,7 +26204,7 @@
42
-#include <ffmpeg/avformat.h>
43
+#include <libavformat/avformat.h>
45
rm -f conftest.$ac_objext
46
if { (ac_try="$ac_compile"
47
@@ -26241,9 +26241,9 @@
49
CPPFLAGS="-I$SEARCH_DIR_HEADERS"
50
unset ac_cv_header_ffmpeg_avformat_h
51
- as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
52
-{ echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h" >&5
53
-echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
54
+ as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/libavformat/avformat.h" | $as_tr_sh`
55
+{ echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h" >&5
56
+echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
57
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
58
echo $ECHO_N "(cached) $ECHO_C" >&6
60
@@ -26259,7 +26259,7 @@
64
-#include <$SEARCH_DIR_HEADERS/ffmpeg/avformat.h>
65
+#include <$SEARCH_DIR_HEADERS/libavformat/avformat.h>
67
rm -f conftest.$ac_objext
68
if { (ac_try="$ac_compile"
69
@@ -26846,7 +26846,7 @@
71
#define __STDC_CONSTANT_MACROS
73
- #include <ffmpeg/avformat.h>
74
+ #include <libavformat/avformat.h>
78
@@ -26895,7 +26895,7 @@
79
#define __STDC_CONSTANT_MACROS
82
- #include <ffmpeg/avformat.h>
83
+ #include <libavformat/avformat.h>
87
Index: mediatomb-0.11.0/configure.ac
88
===================================================================
89
--- mediatomb-0.11.0.orig/configure.ac 2009-01-08 10:56:02.000000000 +0100
90
+++ mediatomb-0.11.0/configure.ac 2009-01-08 10:56:20.000000000 +0100
92
if test "x$FFMPEG_OK" = xyes; then
93
if test -n "$FFMPEG_SEARCH_HEADERS" ; then
94
CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
95
- AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h,
96
+ AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/libavformat/avformat.h,
98
FFMPEG_CXXFLAGS="-I$FFMPEG_SEARCH_HEADERS"
100
@@ -2340,12 +2340,12 @@
104
- AC_CHECK_HEADER(ffmpeg/avformat.h,
105
+ AC_CHECK_HEADER(libavformat/avformat.h,
108
CPPFLAGS="-I$SEARCH_DIR_HEADERS"
109
unset ac_cv_header_ffmpeg_avformat_h
110
- AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
111
+ AC_CHECK_HEADER($SEARCH_DIR_HEADERS/libavformat/avformat.h,
113
FFMPEG_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
115
@@ -2447,7 +2447,7 @@
117
#define __STDC_CONSTANT_MACROS
119
- #include <ffmpeg/avformat.h>
120
+ #include <libavformat/avformat.h>
124
@@ -2462,7 +2462,7 @@
125
#define __STDC_CONSTANT_MACROS
128
- #include <ffmpeg/avformat.h>
129
+ #include <libavformat/avformat.h>
133
Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
134
===================================================================
135
--- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc 2009-01-08 10:56:32.000000000 +0100
136
+++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc 2009-01-08 10:56:45.000000000 +0100
141
-#include <ffmpeg/avformat.h>
142
+#include <libavformat/avformat.h>
144
#ifdef FFMPEG_NEEDS_EXTERN_C