hasufell 15/02/15 19:56:41 Added: ffdiaporama-2.1-ffmpeg-2.4.patch Log: fix build with ffmpeg-2.4 (patch by Olivier Laurantin), move to libav USE flag (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.1 media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch?rev=1.1&content-type=text/plain Index: ffdiaporama-2.1-ffmpeg-2.4.patch =================================================================== --- src/ffDiaporama/engine/cDeviceModelDef.h 2015-02-14 10:02:12.592365100 +0100 +++ src/ffDiaporama/engine/cDeviceModelDef.h 2015-02-14 10:01:59.202463800 +0100 @@ -84,7 +84,12 @@ #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100) #define FFMPEG #include "libswresample/swresample.h" - #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX + #ifdef SWR_CH_MAX + #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX + #else + #define RESAMPLE_MAX_CHANNELS 32 + #endif + #include "libavfilter/avcodec.h" #include "libavfilter/buffersink.h" #include "libavfilter/buffersrc.h"
