diff options
| author | Steffen Weber | 2015-07-07 17:11:15 +0200 |
|---|---|---|
| committer | Steffen Weber | 2015-07-07 17:11:15 +0200 |
| commit | f3cc5930314ccdfaf9785c7e0476200d132ba8d0 (patch) | |
| tree | 7a90ab2f28fb004bed01ceef81d67039b4ead37c /cDeviceModelDef.patch | |
| download | aur-f3cc5930314ccdfaf9785c7e0476200d132ba8d0.tar.gz | |
Initial import
Diffstat (limited to 'cDeviceModelDef.patch')
| -rw-r--r-- | cDeviceModelDef.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/cDeviceModelDef.patch b/cDeviceModelDef.patch new file mode 100644 index 000000000000..6da31ba73ac7 --- /dev/null +++ b/cDeviceModelDef.patch @@ -0,0 +1,39 @@ +--- src/ffDiaporama/engine/cDeviceModelDef.h 2014-02-09 03:48:04.000000000 -0600 ++++ cDeviceModelDef2.h 2015-03-27 11:39:25.965094000 -0600 +@@ -84,13 +84,21 @@ + #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 + #include "libavfilter/avcodec.h" + #include "libavfilter/buffersink.h" + #include "libavfilter/buffersrc.h" +- #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104))) ++ #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,20,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,26,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,25,101))&& (LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,4,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,11,102))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,1,101))&& (LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100))) ++ #define FFMPEGVERSIONINT 260 ++ #define FFMPEGVERSION "FFmpeg 2.6 or higher" ++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,15,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,13,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,15,102))&& (LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,2,103))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,1,101))&& (LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100))) ++ #define FFMPEGVERSIONINT 250 ++ #define FFMPEGVERSION "FFmpeg 2.5" ++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,7,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,1,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,4,101))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,0,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,1,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100))) ++ #define FFMPEGVERSIONINT 247 ++ #define FFMPEGVERSION "FFmpeg 2.4.7" ++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104))) + #define FFMPEGVERSIONINT 210 +- #define FFMPEGVERSION "FFmpeg 2.1 or higher" ++ #define FFMPEGVERSION "FFmpeg 2.1" + #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102))) + #define FFMPEGVERSIONINT 201 + #define FFMPEGVERSION "FFmpeg 2.0.1 or higher" +@@ -103,6 +111,11 @@ + #else + // unsupported version + #endif ++#if (FFMPEGVERSIONINT >=247) ++ #define RESAMPLE_MAX_CHANNELS 32 ++ #else ++ #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX ++ #endif + #endif + } + |