From 3d1808b5ec93069182b730bb8ab826121ef1b78a Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 29 Oct 2012 22:21:58 +0000 Subject: increase minor version in libs. Ubuntu 12 has newer versions, than the 0.8 release of ffmpeg. What a bloody version politics. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2931 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.8/avcodec.pas | 4 ++-- src/lib/ffmpeg-0.8/avformat.pas | 6 +++--- src/lib/ffmpeg-0.8/avutil.pas | 4 ++-- src/lib/ffmpeg-0.8/swscale.pas | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg-0.8/avcodec.pas b/src/lib/ffmpeg-0.8/avcodec.pas index 9805bfd3..5b72d222 100644 --- a/src/lib/ffmpeg-0.8/avcodec.pas +++ b/src/lib/ffmpeg-0.8/avcodec.pas @@ -22,7 +22,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/avcodec.h - * version: 53.7.0 - 53.8.0 + * version: 53.7.0 - 53.35.0 * *) @@ -80,7 +80,7 @@ const *) (* Supported version by this header *) LIBAVCODEC_MAX_VERSION_MAJOR = 53; - LIBAVCODEC_MAX_VERSION_MINOR = 8; + LIBAVCODEC_MAX_VERSION_MINOR = 35; LIBAVCODEC_MAX_VERSION_RELEASE = 0; LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) + diff --git a/src/lib/ffmpeg-0.8/avformat.pas b/src/lib/ffmpeg-0.8/avformat.pas index fdbc2d0c..1127c50a 100644 --- a/src/lib/ffmpeg-0.8/avformat.pas +++ b/src/lib/ffmpeg-0.8/avformat.pas @@ -23,7 +23,7 @@ * * Conversion of version 0.8 libavformat/avformat.h * Min. version: 53.4.0 - * Max. version: 53.5.0 + * Max. version: 53.21.0 *) unit avformat; @@ -56,13 +56,13 @@ uses const (* * IMPORTANT: This headers are valid for all minor revisions of ffmpeg - * version 0.7x + * version 0.8x * This file has been created with the previous ffmpeg headers as a basis * by removing all unneeded conditionals. *) (* Max. supported version by this header *) LIBAVFORMAT_MAX_VERSION_MAJOR = 53; - LIBAVFORMAT_MAX_VERSION_MINOR = 5; + LIBAVFORMAT_MAX_VERSION_MINOR = 21; LIBAVFORMAT_MAX_VERSION_RELEASE = 0; LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) + diff --git a/src/lib/ffmpeg-0.8/avutil.pas b/src/lib/ffmpeg-0.8/avutil.pas index ee66bd47..c740a2c5 100644 --- a/src/lib/ffmpeg-0.8/avutil.pas +++ b/src/lib/ffmpeg-0.8/avutil.pas @@ -24,7 +24,7 @@ * Conversions of * * libavutil/avutil.h: - * version: 51.9.1 + * version: 51.22.1 * *) @@ -55,7 +55,7 @@ uses const (* Max. supported version by this header *) LIBAVUTIL_MAX_VERSION_MAJOR = 51; - LIBAVUTIL_MAX_VERSION_MINOR = 9; + LIBAVUTIL_MAX_VERSION_MINOR = 22; LIBAVUTIL_MAX_VERSION_RELEASE = 1; LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) + diff --git a/src/lib/ffmpeg-0.8/swscale.pas b/src/lib/ffmpeg-0.8/swscale.pas index b32cdeda..923dbf18 100644 --- a/src/lib/ffmpeg-0.8/swscale.pas +++ b/src/lib/ffmpeg-0.8/swscale.pas @@ -19,7 +19,7 @@ * - Ported by the UltraStar Deluxe Team * * Conversion of libswscale/swscale.h - * version: 2.0.0 + * version: 2.1.0 *) unit swscale; @@ -72,7 +72,7 @@ const *) (* Max. supported version by this header *) LIBSWSCALE_MAX_VERSION_MAJOR = 2; - LIBSWSCALE_MAX_VERSION_MINOR = 0; + LIBSWSCALE_MAX_VERSION_MINOR = 1; LIBSWSCALE_MAX_VERSION_RELEASE = 0; LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) + -- cgit v1.2.3