View | Details | Raw Unified | Return to bug 170634
Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 25-32 Link Here
25
USE_PHP=	yes
25
USE_PHP=	yes
26
USE_PHPIZE=	yes
26
USE_PHPIZE=	yes
27
USE_PHPEXT=	yes
27
USE_PHPEXT=	yes
28
DEFAULT_PHP_VER=53
28
DEFAULT_PHP_VER=54
29
IGNORE_WITH_PHP=5
30
29
31
CONFIGURE_ARGS+=	--with-ffmpeg=${LOCALBASE}/include
30
CONFIGURE_ARGS+=	--with-ffmpeg=${LOCALBASE}/include
32
31
(-)files/patch-ffmpeg_movie.c (+40 lines)
Added Link Here
1
--- ffmpeg_movie.c.orig	2008-10-14 00:46:53.000000000 +0200
2
+++ ffmpeg_movie.c	2012-07-23 11:17:46.000000000 +0200
3
@@ -308,7 +308,7 @@
4
     } 
5
 
6
     if (persistent) {
7
-        list_entry *le;
8
+        zend_rsrc_list_entry *le;
9
         /* resolve the fully-qualified path name to use as the hash key */
10
         fullpath = expand_filepath(filename, NULL TSRMLS_CC);
11
 
12
@@ -343,7 +343,7 @@
13
             }
14
             
15
         } else { /* no existing persistant movie, create one */
16
-            list_entry new_le;
17
+            zend_rsrc_list_entry new_le;
18
             ffmovie_ctx = _php_alloc_ffmovie_ctx(1);
19
 
20
             if (_php_open_movie_file(ffmovie_ctx, filename)) {
21
@@ -356,8 +356,8 @@
22
             Z_TYPE(new_le) = le_ffmpeg_pmovie;
23
             new_le.ptr = ffmovie_ctx;
24
 
25
-            if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey, 
26
-                        hashkey_length+1, (void *)&new_le, sizeof(list_entry),
27
+            if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
28
+                        hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry),
29
                         NULL)) {
30
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, 
31
                         "Failed to register persistent resource");
32
@@ -501,7 +501,7 @@
33
                     codec_id));
34
  
35
         if (!decoder) {
36
-            zend_error(E_ERROR, "Could not find decoder for %s", 
37
+            zend_error(E_WARNING, "Could not find decoder for %s", 
38
                     _php_get_filename(ffmovie_ctx));
39
             return NULL;
40
         }

Return to bug 170634