From 7a0c585fedbe21776651fce77a992cce2b319450 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 26 Aug 2010 00:44:37 +0000
Subject: another try to fix compilation on linux.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2625 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avformat.pas | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index 3b6ee3cc..255ff0d5 100644
--- a/src/lib/ffmpeg/avformat.pas
+++ b/src/lib/ffmpeg/avformat.pas
@@ -1246,20 +1246,6 @@ type
     next: PAVImageFormat;
   end; {deprecated}
 
-{$IF LIBAVFORMAT_VERSION >= 52030001} // >= 52.30.1
-(**
- * Convert all the metadata sets from ctx according to the source and
- * destination conversion tables. If one of the tables is NULL, then
- * tags are converted to/from ffmpeg generic tag names.
- *
- * @param d_conv destination tags format conversion table
- * @param s_conv source tags format conversion table
- *)
-procedure av_metadata_conv(ctx: PAVFormatContext, {const} d_conv: PAVMetadataConv,
-                                                  {const} s_conv: PAVMetadataConv);
-  cdecl; external av__format;
-{$IFEND}
-
 procedure av_register_image_format(img_fmt: PAVImageFormat);
     cdecl; external av__format; deprecated;
 
@@ -1278,6 +1264,20 @@ function av_write_image(pb: PByteIOContext; fmt: PAVImageFormat; img: PAVImageIn
     cdecl; external av__format; deprecated;
 {$IFEND}
 
+{$IF LIBAVFORMAT_VERSION >= 52030001} // >= 52.30.1
+(**
+ * Convert all the metadata sets from ctx according to the source and
+ * destination conversion tables. If one of the tables is NULL, then
+ * tags are converted to/from ffmpeg generic tag names.
+ *
+ * @param d_conv destination tags format conversion table
+ * @param s_conv source tags format conversion table
+ *)
+procedure av_metadata_conv(ctx: PAVFormatContext, {const} d_conv: PAVMetadataConv,
+                                                  {const} s_conv: PAVMetadataConv);
+  cdecl; external av__format;
+{$IFEND}
+
 {$IF LIBAVFORMAT_VERSION_MAJOR < 53}
 {
 var
-- 
cgit v1.2.3