From 090181a4c42cf8d422d7c6d482ce1876c2d44420 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Sep 2012 07:04:20 +0200 Subject: php-ffmpeg-0.7.0-0.1.svn678 --- php-ffmpeg-php54.patch | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 php-ffmpeg-php54.patch (limited to 'php-ffmpeg-php54.patch') diff --git a/php-ffmpeg-php54.patch b/php-ffmpeg-php54.patch new file mode 100644 index 0000000..6a7e1ab --- /dev/null +++ b/php-ffmpeg-php54.patch @@ -0,0 +1,39 @@ +diff -up ffmpeg-php-svn678/ffmpeg_movie.c.php54 ffmpeg-php-svn678/ffmpeg_movie.c +--- ffmpeg-php-svn678/ffmpeg_movie.c.php54 2012-09-17 06:08:57.113312219 +0200 ++++ ffmpeg-php-svn678/ffmpeg_movie.c 2012-09-17 06:12:10.425069883 +0200 +@@ -36,7 +36,7 @@ + + #include + #include +-#include ++#include + #include + + #ifdef HAVE_CONFIG_H +@@ -315,7 +315,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + } + + if (persistent) { +- list_entry *le; ++ zend_rsrc_list_entry *le; + /* resolve the fully-qualified path name to use as the hash key */ + fullpath = expand_filepath(filename, NULL TSRMLS_CC); + +@@ -350,7 +350,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + } + + } else { /* no existing persistant movie, create one */ +- list_entry new_le; ++ zend_rsrc_list_entry new_le; + ffmovie_ctx = _php_alloc_ffmovie_ctx(1); + + if (_php_open_movie_file(ffmovie_ctx, filename)) { +@@ -364,7 +364,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + new_le.ptr = ffmovie_ctx; + + if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey, +- hashkey_length+1, (void *)&new_le, sizeof(list_entry), ++ hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry), + NULL)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Failed to register persistent resource"); -- cgit