mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-19 13:12:33 -07:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
31 lines
907 B
Diff
31 lines
907 B
Diff
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;
|
|
}
|
|
|