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 *)