| 1 |
aballier 12/01/09 15:26:53 |
| 2 |
|
| 3 |
Modified: ffmpeg-php-0.6.0-ffmpeg.patch |
| 4 |
Added: ffmpeg-php-0.6.0-log.patch |
| 5 |
Log: |
| 6 |
look for metadata closer to what the test suite expects, disable logging outside of php so that most of the testsuite passes now |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: ffmpeg-php-0.6.0-ffmpeg.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- ffmpeg-php-0.6.0-ffmpeg.patch 9 Jan 2012 14:53:06 -0000 1.1 |
| 24 |
+++ ffmpeg-php-0.6.0-ffmpeg.patch 9 Jan 2012 15:26:53 -0000 1.2 |
| 25 |
@@ -131,7 +131,7 @@ |
| 26 |
|
| 27 |
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->album, |
| 28 |
- strlen(ffmovie_ctx->fmt_ctx->album), 1); |
| 29 |
-+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ALBUMTITLE"); |
| 30 |
++ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ALBUM"); |
| 31 |
+ RETURN_STRINGL(val, strlen(val), 1); |
| 32 |
} |
| 33 |
/* }}} */ |
| 34 |
@@ -174,7 +174,7 @@ |
| 35 |
GET_MOVIE_RESOURCE(ffmovie_ctx); |
| 36 |
|
| 37 |
- RETURN_LONG(ffmovie_ctx->fmt_ctx->year); |
| 38 |
-+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "YEAR"); |
| 39 |
++ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "DATE"); |
| 40 |
+ RETURN_STRINGL(val, strlen(val), 1); |
| 41 |
} |
| 42 |
/* }}} */ |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: ffmpeg-php-0.6.0-log.patch |
| 52 |
=================================================================== |
| 53 |
Index: work/php5.3/ffmpeg-php.c |
| 54 |
=================================================================== |
| 55 |
--- work.orig/php5.3/ffmpeg-php.c |
| 56 |
+++ work/php5.3/ffmpeg-php.c |
| 57 |
@@ -101,6 +101,7 @@ PHP_MINIT_FUNCTION(ffmpeg) |
| 58 |
if (INI_BOOL("ffmpeg.show_warnings")) { |
| 59 |
av_log_set_callback(ffmpeg_errorhandler); |
| 60 |
} |
| 61 |
+ else av_log_set_level(AV_LOG_QUIET); |
| 62 |
|
| 63 |
register_ffmpeg_movie_class(module_number); |
| 64 |
register_ffmpeg_frame_class(module_number); |
Archives