blob: 1e7fea748d9ebd9f2de80c5d742b5d2b99f30acc (
plain)
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
|
diff -up ./config.m4.incl ./config.m4
--- ./config.m4.incl 2009-07-02 19:15:48.000000000 +0200
+++ ./config.m4 2012-09-17 06:31:46.733978790 +0200
@@ -41,6 +41,18 @@ if test "$PHP_FFMPEG" != "no"; then
PHP_ADD_INCLUDE($i/include/libavdevice/)
FFMPEG_INC_FOUND=$i/include/libavcodec
break
+ elif test -f $i/libavcodec/avcodec.h; then
+ dnl ffmpeg svn revision 12194 and newer put each header in its own dir
+ dnl ffmpeg-devel RPM install in /usr/include/ffmpeg/*
+ PHP_ADD_INCLUDE($i)
+ PHP_ADD_INCLUDE($i/libavcodec/)
+ PHP_ADD_INCLUDE($i/libavformat/)
+ PHP_ADD_INCLUDE($i/libavutil/)
+ PHP_ADD_INCLUDE($i/libswscale/)
+ PHP_ADD_INCLUDE($i/libavfilter/)
+ PHP_ADD_INCLUDE($i/libavdevice/)
+ FFMPEG_INC_FOUND=$i
+ break
fi
done
diff -up ./ffmpeg_frame.c.incl ./ffmpeg_frame.c
--- ./ffmpeg_frame.c.incl 2012-09-17 06:44:58.242810037 +0200
+++ ./ffmpeg_frame.c 2012-09-17 06:44:07.729629307 +0200
@@ -57,7 +57,7 @@
allow ffmpeg-php to be built without access to the php sources
*/
#if HAVE_LIBGD20
-#include "gd.h"
+#include "gd/libgd/gd.h"
#define FFMPEG_PHP_FETCH_IMAGE_RESOURCE(gd_img, ret) { \
ZEND_GET_RESOURCE_TYPE_ID(le_gd, "gd"); \
|
