aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-08-26 00:30:58 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-08-26 00:30:58 +0000
commit31ec38a0595c8bbd6e18677bce127607814744aa (patch)
tree4b06a79859395a4b589c525f37a2bbab17da9445
parentbb47f56a41521dfd9e00201eca4ff39aff765695 (diff)
downloadusdx-31ec38a0595c8bbd6e18677bce127607814744aa.tar.gz
usdx-31ec38a0595c8bbd6e18677bce127607814744aa.tar.xz
usdx-31ec38a0595c8bbd6e18677bce127607814744aa.zip
fix compilation on linux.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2623 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avformat.pas28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index aba64565..3b6ee3cc 100644
--- a/src/lib/ffmpeg/avformat.pas
+++ b/src/lib/ffmpeg/avformat.pas
@@ -249,20 +249,6 @@ function av_metadata_set2(var pm: PAVMetadata; key: {const} PAnsiChar; value: {c
cdecl; external av__format;
{$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}
-
(**
* Free all the memory allocated for an AVMetadata struct.
*)
@@ -1260,6 +1246,20 @@ 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;