From 724522cddc21d41d14f2ef343ae7e858c240e1d6 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 13:46:46 +0000
Subject: comments re: TAVMediaType. no code change

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2368 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avcodec.pas | 5 +++++
 src/lib/ffmpeg/avutil.pas  | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index ee0cb983..175ed053 100644
--- a/src/lib/ffmpeg/avcodec.pas
+++ b/src/lib/ffmpeg/avcodec.pas
@@ -492,6 +492,11 @@ type
   );
 {$IFEND}
 
+{
+  TAVMediaType moved to avutil in LIBAVUTIL_VERSION 50.14.0
+  but moving it in the pascal headers was not really necessary
+  but caused problems. So, I (KMS) left it here.
+}
 {$IF LIBAVCODEC_VERSION >= 52064000} // >= 52.64.0
 type
   TAVMediaType = (
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index cc1e3d44..708b5533 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -141,7 +141,11 @@ function avutil_license(): PAnsiChar;
   cdecl; external av__format;
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 50020000} // >= 50.14.0
+{
+  TAVMediaType moved to avutil in LIBAVUTIL_VERSION 50.14.0
+  but moving it in the pascal headers was not really necessary
+  but caused problems. So, I (KMS) left it there.
+
 type
   TAVMediaType = (
     AVMEDIA_TYPE_UNKNOWN = -1,
@@ -152,7 +156,7 @@ type
     AVMEDIA_TYPE_ATTACHMENT,
     AVMEDIA_TYPE_NB
   );
-{$IFEND}
+}
 
 (* libavutil/error.h *)
 
-- 
cgit v1.2.3