aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-04-23 16:18:07 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-04-23 16:18:07 +0000
commit79f3a57c944f72f2cc40734f347bcf020e6f5633 (patch)
tree869dc1bb563c42c8b3ed1beeeaf034e00dca5d0c
parent011198e5b6182245f05a15a8e85b7fde4c402e13 (diff)
downloadusdx-79f3a57c944f72f2cc40734f347bcf020e6f5633.tar.gz
usdx-79f3a57c944f72f2cc40734f347bcf020e6f5633.tar.xz
usdx-79f3a57c944f72f2cc40734f347bcf020e6f5633.zip
move includes to the top of the files.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2868 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-0.7/avcodec.pas6
-rw-r--r--src/lib/ffmpeg-0.7/avutil.pas46
-rw-r--r--src/lib/ffmpeg-0.8/avcodec.pas6
-rw-r--r--src/lib/ffmpeg-0.8/avutil.pas46
4 files changed, 54 insertions, 50 deletions
diff --git a/src/lib/ffmpeg-0.7/avcodec.pas b/src/lib/ffmpeg-0.7/avcodec.pas
index b2ed9fd2..6fb6a873 100644
--- a/src/lib/ffmpeg-0.7/avcodec.pas
+++ b/src/lib/ffmpeg-0.7/avcodec.pas
@@ -173,6 +173,10 @@ const
FF_API_GET_PIX_FMT_NAME = LIBAVCODEC_VERSION_MAJOR < 54;
{$endif}
+{$IF FF_API_OLD_AUDIOCONVERT}
+ {$I libavcodec/audioconvert.pas}
+{$ENDIF}
+
type
FF_INTERNALC_MEM_TYPE = cuint;
@@ -525,8 +529,6 @@ const
{$IF FF_API_OLD_AUDIOCONVERT}
-{$I libavcodec/audioconvert.pas}
-
const
{* Audio channel masks *}
CH_FRONT_LEFT = AV_CH_FRONT_LEFT;
diff --git a/src/lib/ffmpeg-0.7/avutil.pas b/src/lib/ffmpeg-0.7/avutil.pas
index 760ad4e1..3e6f5bcc 100644
--- a/src/lib/ffmpeg-0.7/avutil.pas
+++ b/src/lib/ffmpeg-0.7/avutil.pas
@@ -78,6 +78,29 @@ const
{$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
{$IFEND}
+{$INCLUDE libavutil/cpu.pas}
+
+{$INCLUDE libavutil/dict.pas}
+
+{$INCLUDE libavutil/error.pas}
+
+{$INCLUDE libavutil/mathematics.pas}
+
+{$INCLUDE libavutil/mem.pas}
+
+{$INCLUDE libavutil/opt.pas}
+
+{$INCLUDE libavutil/log.pas}
+
+{$INCLUDE libavutil/pixfmt.pas}
+
+{$INCLUDE libavutil/samplefmt.pas}
+
+(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
+
+function MKTAG (a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer;
+
(**
* Return the LIBAVUTIL_VERSION_INT constant.
*)
@@ -147,29 +170,6 @@ type
function av_get_picture_type_char(pict_type: TAVPictureType): Pchar;
cdecl; external av__util;
-{$INCLUDE libavutil/cpu.pas}
-
-{$INCLUDE libavutil/dict.pas}
-
-{$INCLUDE libavutil/error.pas}
-
-{$INCLUDE libavutil/mathematics.pas}
-
-{$INCLUDE libavutil/mem.pas}
-
-{$INCLUDE libavutil/opt.pas}
-
-{$INCLUDE libavutil/log.pas}
-
-{$INCLUDE libavutil/pixfmt.pas}
-
-{$INCLUDE libavutil/samplefmt.pas}
-
-(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
-
-function MKTAG (a, b, c, d: AnsiChar): integer;
-function MKBETAG(a, b, c, d: AnsiChar): integer;
-
implementation
(* libavutil/common.h *)
diff --git a/src/lib/ffmpeg-0.8/avcodec.pas b/src/lib/ffmpeg-0.8/avcodec.pas
index b2ed9fd2..6fb6a873 100644
--- a/src/lib/ffmpeg-0.8/avcodec.pas
+++ b/src/lib/ffmpeg-0.8/avcodec.pas
@@ -173,6 +173,10 @@ const
FF_API_GET_PIX_FMT_NAME = LIBAVCODEC_VERSION_MAJOR < 54;
{$endif}
+{$IF FF_API_OLD_AUDIOCONVERT}
+ {$I libavcodec/audioconvert.pas}
+{$ENDIF}
+
type
FF_INTERNALC_MEM_TYPE = cuint;
@@ -525,8 +529,6 @@ const
{$IF FF_API_OLD_AUDIOCONVERT}
-{$I libavcodec/audioconvert.pas}
-
const
{* Audio channel masks *}
CH_FRONT_LEFT = AV_CH_FRONT_LEFT;
diff --git a/src/lib/ffmpeg-0.8/avutil.pas b/src/lib/ffmpeg-0.8/avutil.pas
index 29bec9e2..541aaa61 100644
--- a/src/lib/ffmpeg-0.8/avutil.pas
+++ b/src/lib/ffmpeg-0.8/avutil.pas
@@ -78,6 +78,29 @@ const
{$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
{$IFEND}
+{$INCLUDE libavutil/cpu.pas}
+
+{$INCLUDE libavutil/dict.pas}
+
+{$INCLUDE libavutil/error.pas}
+
+{$INCLUDE libavutil/mathematics.pas}
+
+{$INCLUDE libavutil/mem.pas}
+
+{$INCLUDE libavutil/opt.pas}
+
+{$INCLUDE libavutil/log.pas}
+
+{$INCLUDE libavutil/pixfmt.pas}
+
+{$INCLUDE libavutil/samplefmt.pas}
+
+(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
+
+function MKTAG (a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer;
+
(**
* Return the LIBAVUTIL_VERSION_INT constant.
*)
@@ -140,29 +163,6 @@ type
function av_get_picture_type_char(pict_type: TAVPictureType): Pchar;
cdecl; external av__util;
-{$INCLUDE libavutil/cpu.pas}
-
-{$INCLUDE libavutil/dict.pas}
-
-{$INCLUDE libavutil/error.pas}
-
-{$INCLUDE libavutil/mathematics.pas}
-
-{$INCLUDE libavutil/mem.pas}
-
-{$INCLUDE libavutil/opt.pas}
-
-{$INCLUDE libavutil/log.pas}
-
-{$INCLUDE libavutil/pixfmt.pas}
-
-{$INCLUDE libavutil/samplefmt.pas}
-
-(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
-
-function MKTAG (a, b, c, d: AnsiChar): integer;
-function MKBETAG(a, b, c, d: AnsiChar): integer;
-
implementation
(* libavutil/common.h *)