aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-22 23:27:19 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-22 23:27:19 +0000
commita877fedebf9bfdbeab9fe806123b5385ee53bb66 (patch)
tree3bf8a7dd5c808ebd760e7f8ba9ef794014b9926d
parent393318eaafc6e9ed59e2c79327c46b03f6ad3574 (diff)
downloadusdx-a877fedebf9bfdbeab9fe806123b5385ee53bb66.tar.gz
usdx-a877fedebf9bfdbeab9fe806123b5385ee53bb66.tar.xz
usdx-a877fedebf9bfdbeab9fe806123b5385ee53bb66.zip
Set min and max versions for the ffmpeg-2.1 libraries
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3043 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-2.1/avcodec.pas8
-rw-r--r--src/lib/ffmpeg-2.1/avformat.pas8
-rw-r--r--src/lib/ffmpeg-2.1/avutil.pas8
-rw-r--r--src/lib/ffmpeg-2.1/swscale.pas4
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/ffmpeg-2.1/avcodec.pas b/src/lib/ffmpeg-2.1/avcodec.pas
index cdfbbc74..f9f7ff50 100644
--- a/src/lib/ffmpeg-2.1/avcodec.pas
+++ b/src/lib/ffmpeg-2.1/avcodec.pas
@@ -81,16 +81,16 @@ const
(* Supported version by this header *)
LIBAVCODEC_MAX_VERSION_MAJOR = 55;
- LIBAVCODEC_MAX_VERSION_MINOR = 18;
- LIBAVCODEC_MAX_VERSION_RELEASE = 102;
+ LIBAVCODEC_MAX_VERSION_MINOR = 39;
+ LIBAVCODEC_MAX_VERSION_RELEASE = 101;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVCODEC_MAX_VERSION_RELEASE * VERSION_RELEASE);
(* Min. supported version by this header *)
LIBAVCODEC_MIN_VERSION_MAJOR = 55;
- LIBAVCODEC_MIN_VERSION_MINOR = 18;
- LIBAVCODEC_MIN_VERSION_RELEASE = 0;
+ LIBAVCODEC_MIN_VERSION_MINOR = 39;
+ LIBAVCODEC_MIN_VERSION_RELEASE = 100;
LIBAVCODEC_MIN_VERSION = (LIBAVCODEC_MIN_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MIN_VERSION_MINOR * VERSION_MINOR) +
(LIBAVCODEC_MIN_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/src/lib/ffmpeg-2.1/avformat.pas b/src/lib/ffmpeg-2.1/avformat.pas
index 32af4522..6c886b0c 100644
--- a/src/lib/ffmpeg-2.1/avformat.pas
+++ b/src/lib/ffmpeg-2.1/avformat.pas
@@ -59,16 +59,16 @@ const
*)
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 55;
- LIBAVFORMAT_MAX_VERSION_MINOR = 12;
- LIBAVFORMAT_MAX_VERSION_RELEASE = 100;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 19;
+ LIBAVFORMAT_MAX_VERSION_RELEASE = 104;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVFORMAT_MAX_VERSION_RELEASE * VERSION_RELEASE);
(* Min. supported version by this header *)
LIBAVFORMAT_MIN_VERSION_MAJOR = 55;
- LIBAVFORMAT_MIN_VERSION_MINOR = 12;
- LIBAVFORMAT_MIN_VERSION_RELEASE = 0;
+ LIBAVFORMAT_MIN_VERSION_MINOR = 19;
+ LIBAVFORMAT_MIN_VERSION_RELEASE = 104;
LIBAVFORMAT_MIN_VERSION = (LIBAVFORMAT_MIN_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MIN_VERSION_MINOR * VERSION_MINOR) +
(LIBAVFORMAT_MIN_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/src/lib/ffmpeg-2.1/avutil.pas b/src/lib/ffmpeg-2.1/avutil.pas
index 4383797d..eca5bf04 100644
--- a/src/lib/ffmpeg-2.1/avutil.pas
+++ b/src/lib/ffmpeg-2.1/avutil.pas
@@ -55,16 +55,16 @@ uses
const
(* Max. supported version by this header *)
LIBAVUTIL_MAX_VERSION_MAJOR = 52;
- LIBAVUTIL_MAX_VERSION_MINOR = 38;
- LIBAVUTIL_MAX_VERSION_RELEASE = 100;
+ LIBAVUTIL_MAX_VERSION_MINOR = 48;
+ LIBAVUTIL_MAX_VERSION_RELEASE = 101;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
(* Min. supported version by this header *)
LIBAVUTIL_MIN_VERSION_MAJOR = 52;
- LIBAVUTIL_MIN_VERSION_MINOR = 38;
- LIBAVUTIL_MIN_VERSION_RELEASE = 0;
+ LIBAVUTIL_MIN_VERSION_MINOR = 48;
+ LIBAVUTIL_MIN_VERSION_RELEASE = 100;
LIBAVUTIL_MIN_VERSION = (LIBAVUTIL_MIN_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MIN_VERSION_MINOR * VERSION_MINOR) +
(LIBAVUTIL_MIN_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/src/lib/ffmpeg-2.1/swscale.pas b/src/lib/ffmpeg-2.1/swscale.pas
index 6bcd3638..0a107c1d 100644
--- a/src/lib/ffmpeg-2.1/swscale.pas
+++ b/src/lib/ffmpeg-2.1/swscale.pas
@@ -73,8 +73,8 @@ const
(* Max. supported version by this header *)
LIBSWSCALE_MAX_VERSION_MAJOR = 2;
- LIBSWSCALE_MAX_VERSION_MINOR = 3;
- LIBSWSCALE_MAX_VERSION_RELEASE = 100;
+ LIBSWSCALE_MAX_VERSION_MINOR = 5;
+ LIBSWSCALE_MAX_VERSION_RELEASE = 101;
LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBSWSCALE_MAX_VERSION_RELEASE * VERSION_RELEASE);