summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch')
-rw-r--r--dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch
new file mode 100644
index 000000000000..a66d92b04f51
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg1.patch
@@ -0,0 +1,30 @@
+Fix runtime with ffmpeg-1.
+https://bugs.gentoo.org/show_bug.cgi?id=461438
+
+Index: php5.3/ffmpeg-php.c
+===================================================================
+--- php5.3.orig/ffmpeg-php.c
++++ php5.3/ffmpeg-php.c
+@@ -90,9 +90,6 @@ PHP_INI_END()
+ */
+ PHP_MINIT_FUNCTION(ffmpeg)
+ {
+- /* must be called before using avcodec libraries. */
+- avcodec_init();
+-
+ /* register all codecs */
+ av_register_all();
+
+Index: php5.3/ffmpeg_movie.c
+===================================================================
+--- php5.3.orig/ffmpeg_movie.c
++++ php5.3/ffmpeg_movie.c
+@@ -259,7 +259,7 @@ static int _php_open_movie_file(ff_movie
+ }
+
+ /* open the file with generic libav function */
+- if (av_open_input_file(&ffmovie_ctx->fmt_ctx, filename, NULL, 0, NULL) < 0) {
++ if (avformat_open_input(&ffmovie_ctx->fmt_ctx, filename, NULL, NULL) < 0) {
+ return 1;
+ }
+