grknight 15/06/24 01:02:47 Added: ffmpeg-php-0.6.0-libav10.patch Log: Fix build failures wrt bug 545700 ; Revbump to include the libav IUSE so we can rebuilt against libav/ffmpeg subslots (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)
Revision Changes Path 1.1 dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-libav10.patch?rev=1.1&content-type=text/plain Index: ffmpeg-php-0.6.0-libav10.patch =================================================================== diff -aurN a/ffmpeg_movie.c b/ffmpeg_movie.c --- a/ffmpeg_movie.c 2015-06-22 19:46:01.220498329 -0400 +++ b/ffmpeg_movie.c 2015-06-22 20:44:26.802671398 -0400 @@ -697,7 +697,16 @@ return rate; } -#if LIBAVCODEC_BUILD > 4753 +#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */ + if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){ + if (st->avg_frame_rate.den && st->avg_frame_rate.num) { + rate = av_q2d(st->avg_frame_rate); + } else { + rate = 1 / av_q2d(GET_CODEC_FIELD(st->codec, time_base)); + } + } + return (float)rate; +#elif LIBAVCODEC_BUILD > 4753 if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){ if (st->r_frame_rate.den && st->r_frame_rate.num) { rate = av_q2d(st->r_frame_rate); @@ -980,14 +980,22 @@ if (p) { codec_name = p->name; #ifdef FF_API_SUB_ID +#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */ + if (decoder_ctx->codec_id == AV_CODEC_ID_MP3) { +#else if (decoder_ctx->codec_id == CODEC_ID_MP3) { +#endif if (decoder_ctx->sub_id == 2) codec_name = "mp2"; else if (decoder_ctx->sub_id == 1) codec_name = "mp1"; } #endif +#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */ + } else if (decoder_ctx->codec_id == AV_CODEC_ID_MPEG2TS) { +#else } else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) { +#endif /* fake mpeg2 transport stream codec (currently not registered) */ codec_name = "mpeg2ts"; } else if (decoder_ctx->codec_name[0] != '\0') {
