diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-06-13 11:14:47 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-06-13 11:14:47 +0000 |
| commit | 19e9af5d971b48c18342b9e5122d278d9966290a (patch) | |
| tree | ca603f56e48c5ee5d14cc2d0091c7d067d596d4e /src/lib/ffmpeg | |
| parent | 8e745a050c99303a8452cc10aced30eeb73cc975 (diff) | |
| download | usdx-19e9af5d971b48c18342b9e5122d278d9966290a.tar.gz usdx-19e9af5d971b48c18342b9e5122d278d9966290a.tar.xz usdx-19e9af5d971b48c18342b9e5122d278d9966290a.zip | |
1st try to fix linux compilation error: reordering of type declarations.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1819 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg')
| -rw-r--r-- | src/lib/ffmpeg/avformat.pas | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas index 0f2eadfa..0ec2c118 100644 --- a/src/lib/ffmpeg/avformat.pas +++ b/src/lib/ffmpeg/avformat.pas @@ -132,21 +132,6 @@ type PAVMetadata = Pointer; -{$IF LIBAVFORMAT_VERSION >= 52030001} // >= 52.30.1 -(** - * Convert all the metadata sets from ctx according to the source and - * destination conversion tables. - * @param d_conv destination tags format conversion table - * @param s_conv source tags format conversion table - *) - PAVMetadataConv = ^TAVMetadataConv; - TAVMetadataConv = record - ctx: PAVFormatContext; - d_conv: {const} PAVMetadataConv; - s_conv: {const} PAVMetadataConv; - end; -{$IFEND} - {$IF LIBAVFORMAT_VERSION > 52024001} // > 52.24.1 (** * Gets a metadata element with matching key. @@ -392,6 +377,21 @@ type PAVImageInfo = ^TAVImageInfo; {$IFEND} +{$IF LIBAVFORMAT_VERSION >= 52030001} // >= 52.30.1 +(** + * Convert all the metadata sets from ctx according to the source and + * destination conversion tables. + * @param d_conv destination tags format conversion table + * @param s_conv source tags format conversion table + *) + PAVMetadataConv = ^TAVMetadataConv; + TAVMetadataConv = record + ctx: PAVFormatContext; + d_conv: {const} PAVMetadataConv; + s_conv: {const} PAVMetadataConv; + end; +{$IFEND} + PAVChapter = ^TAVChapter; TAVChapter = record id: cint; ///< unique ID to identify the chapter |